更换工具包3.0.0

pom.xml

@@ -19,47 +19,77 @@
 
     <dependencies>
 
-
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <artifactId>4dkankan-common-utils</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-redis</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <artifactId>4dkankan-utils-fyun-oss</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-rabbitmq</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <artifactId>4dkankan-utils-fyun-s3</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-mongodb</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <artifactId>4dkankan-utils-redis</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-db</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-sms</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-model</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-image</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-rabbitmq</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-sensitive-word</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common-web</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
@@ -128,6 +158,11 @@
             <version>1.14.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/fdkankan/ucenter/controller/SceneApplyController.java

@@ -5,15 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.ucenter.entity.SceneApply;
 import com.fdkankan.ucenter.service.ISceneApplyService;
+import com.fdkankan.web.response.ResultData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -1,23 +1,12 @@
 package com.fdkankan.ucenter.controller;
 
-import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.service.IScene3dNumService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @RestController
 public class TestController {
 
-    @Autowired
-    private UploadToOssUtil uploadToOssUtil;
-
     @RequestMapping("/test")
     public Result test() throws Exception {
 

src/main/java/com/fdkankan/ucenter/controller/api/FusionController.java

@@ -1,12 +1,14 @@
 package com.fdkankan.ucenter.controller.api;
 
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.service.IFusionService;
-import com.fdkankan.ucenter.service.IScenePlusVoidService;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/fusion")

src/main/java/com/fdkankan/ucenter/exception/GlobalExceptionHandler.java

@@ -1,36 +1,36 @@
-package com.fdkankan.ucenter.exception;
-
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.ucenter.common.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-/**
- * 全局异常处理器
- */
-@RestControllerAdvice
-@Slf4j
-public class GlobalExceptionHandler {
-
-    /**
-     * 处理未知异常
-     */
-    @ResponseBody
-    @ExceptionHandler(value = Exception.class)
-    public Result exceptionHandler(Exception e) throws Exception {
-        log.error("服务错误:", e);
-        return Result.failure( 500, e.getMessage());
-    }
-
-    /**
-     * 处理业务异常
-     */
-    @ResponseBody
-    @ExceptionHandler(value = BusinessException.class)
-    public Result businessExceptionHandler(BusinessException e) {
-        log.info("业务异常code:{},message:{}", e.getCode(), e.getMessage());
-        return Result.failure(e.getCode(), e.getMessage());
-    }
-}
+//package com.fdkankan.ucenter.exception;
+//
+//import com.fdkankan.common.exception.BusinessException;
+//import com.fdkankan.ucenter.common.Result;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.web.bind.annotation.ExceptionHandler;
+//import org.springframework.web.bind.annotation.ResponseBody;
+//import org.springframework.web.bind.annotation.RestControllerAdvice;
+//
+///**
+// * 全局异常处理器
+// */
+//@RestControllerAdvice
+//@Slf4j
+//public class GlobalExceptionHandler {
+//
+//    /**
+//     * 处理未知异常
+//     */
+//    @ResponseBody
+//    @ExceptionHandler(value = Exception.class)
+//    public Result exceptionHandler(Exception e) throws Exception {
+//        log.error("服务错误:", e);
+//        return Result.failure( 500, e.getMessage());
+//    }
+//
+//    /**
+//     * 处理业务异常
+//     */
+//    @ResponseBody
+//    @ExceptionHandler(value = BusinessException.class)
+//    public Result businessExceptionHandler(BusinessException e) {
+//        log.info("业务异常code:{},message:{}", e.getCode(), e.getMessage());
+//        return Result.failure(e.getCode(), e.getMessage());
+//    }
+//}

src/main/java/com/fdkankan/ucenter/pay/factory/PayFactory.java

@@ -1,8 +1,8 @@
 package com.fdkankan.ucenter.pay.factory;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.util.SpringUtil;
 import com.fdkankan.ucenter.vo.request.PlaceOrderParam;
+import com.fdkankan.web.util.SpringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/ucenter/pay/factory/impl/PayOrderService.java

@@ -6,7 +6,7 @@ import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.AlipayTradeWapPayModel;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.MD5;

src/main/java/com/fdkankan/ucenter/pay/strategy/OrderStrategyFactory.java

@@ -1,16 +1,14 @@
 package com.fdkankan.ucenter.pay.strategy;
 
-import com.fdkankan.common.util.SpringUtil;
-import com.fdkankan.ucenter.entity.OrderItem;
 import com.fdkankan.ucenter.vo.response.OrderItemVo;
+import com.fdkankan.web.util.SpringUtil;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 @Log4j2
 @Component
 public class OrderStrategyFactory implements InitializingBean {

src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.CameraParam;

src/main/java/com/fdkankan/ucenter/service/IDownloadOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.DownNumParam;

src/main/java/com/fdkankan/ucenter/service/IExpansionOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.ExpansionOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.VirtualOrderParam;

src/main/java/com/fdkankan/ucenter/service/IFusionService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 
 public interface IFusionService {

src/main/java/com/fdkankan/ucenter/service/IIncrementOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.entity.IncrementType;

src/main/java/com/fdkankan/ucenter/service/IOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.fdkankan.ucenter.entity.Order;

src/main/java/com/fdkankan/ucenter/service/ISceneUpgradeToV4Service.java

@@ -1,10 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.ucenter.common.Result;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 /**
  * <p>

src/main/java/com/fdkankan/ucenter/service/IUserIncrementService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.UserIncrement;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.IncrementParam;

src/main/java/com/fdkankan/ucenter/service/IVirtualOrderService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.VirtualOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.IncrementOrderParam;

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -1,10 +1,10 @@
 package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.constant.LoginConstant;

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.ucenter.entity.*;

src/main/java/com/fdkankan/ucenter/service/impl/DownloadOrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.fdkankan.ucenter.entity.Invoice;

src/main/java/com/fdkankan/ucenter/service/impl/ExpansionOrderServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.ExpansionOrder;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.mapper.IExpansionOrderMapper;

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -3,7 +3,7 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;

src/main/java/com/fdkankan/ucenter/service/impl/IncrementOrderServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.ucenter.common.SkuEnum;
 import com.fdkankan.ucenter.constant.LoginConstant;

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -1,10 +1,15 @@
 package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.*;
+import com.fdkankan.common.util.Base64Converter;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.common.util.NumberUtils;
+import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.image.MatrixToImageWriterUtil;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sms.SendMailAcceUtils;
@@ -22,14 +27,13 @@ import com.fdkankan.ucenter.vo.request.LoginParam;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.response.LoginVo;
 import com.fdkankan.ucenter.vo.response.UserVo;
+import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 @Service
 public class LoginService {
 
@@ -168,7 +172,7 @@ public class LoginService {
         }
         //二维码失效，清除本地文件二维码
         if(!redisUtil.hasKey(RedisKeyUtil.QRCODE +uuid)){
-            FileUtil.delFile(QrCodeFilePath.LOGIN_QR_CODE_PATH + uuid + ".png");
+            FileUtils.delFile(QrCodeFilePath.LOGIN_QR_CODE_PATH + uuid + ".png");
             throw new BusinessException(LoginConstant.FAILURE_CODE_3035, LoginConstant.FAILURE_MSG_3035);
         }
         if(!redisUtil.hasKey(uuid)){

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.redis.util.RedisUtil;

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -2,20 +2,26 @@ package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.constant.UploadFilePath;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.ucenter.entity.*;
-import com.fdkankan.ucenter.mapper.IScenePlusMapper;
-import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.SceneEditControls;
+import com.fdkankan.ucenter.entity.SceneEditInfo;
+import com.fdkankan.ucenter.entity.SceneEditInfoExt;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
+import com.fdkankan.ucenter.mapper.IScenePlusMapper;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ISceneCopyLogService;
+import com.fdkankan.ucenter.service.ISceneEditControlsService;
+import com.fdkankan.ucenter.service.ISceneEditInfoExtService;
+import com.fdkankan.ucenter.service.ISceneEditInfoService;
+import com.fdkankan.ucenter.service.IScenePlusExtService;
+import com.fdkankan.ucenter.service.IScenePlusService;
+import com.fdkankan.ucenter.service.ISceneProService;
 import java.util.HashMap;
 import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -41,9 +47,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Autowired
     private ISceneCopyLogService sceneCopyLogService;
     @Autowired
-    UploadToOssUtil uploadToOssUtil;
-    @Autowired
-    ISceneProService sceneProService;
+    private ISceneProService sceneProService;
 
     @Override
     public Long getCountByUserId(Long userId, List<Integer> sceneSourceList) {

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusVoidServiceImpl.java

@@ -3,8 +3,8 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.entity.ScenePlus;
 import com.fdkankan.ucenter.entity.ScenePlusVoid;
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.ScenePlusVo;
+import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,13 +39,13 @@ import java.util.stream.Collectors;
 public class ScenePlusVoidServiceImpl extends ServiceImpl<IScenePlusVoidMapper, ScenePlusVoid> implements IScenePlusVoidService {
 
     @Autowired
-    IFusionService fusionService;
+    private IFusionService fusionService;
     @Autowired
-    IUserService userService;
+    private IUserService userService;
     @Autowired
-    IScenePlusService scenePlusService;
-    @Autowired
-    UploadToOssUtil uploadToOssUtil;
+    private IScenePlusService scenePlusService;
+    @Resource
+    private FYunFileServiceInterface fYunFileService;
 
     @Override
     public void setStatus(String num, Integer type,String token) {
@@ -104,7 +105,7 @@ public class ScenePlusVoidServiceImpl extends ServiceImpl<IScenePlusVoidMapper,
         List<ScenePlusVo> newList = new ArrayList<>();
         for (ScenePlusVo scenePlusVo : list) {  //检测oss 是否存在houseType
             String key = String.format(OssPath.houseTypePath,scenePlusVo.getNum());
-            if(uploadToOssUtil.existKey(key)){
+            if(fYunFileService.fileExist(key)){
                 newList.add(scenePlusVo);
             }
         }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -4,27 +4,62 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.constant.ConstantFilePath;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.SceneConstant;
-import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.util.*;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.common.util.RandomUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.image.MatrixToImageWriterUtil;
+import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
-import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.Folder;
+import com.fdkankan.ucenter.entity.SceneEditInfo;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
+import com.fdkankan.ucenter.entity.ScenePro;
+import com.fdkankan.ucenter.entity.SceneProEdit;
+import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.mapper.ISceneProMapper;
-import com.fdkankan.ucenter.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.IFolderSceneService;
+import com.fdkankan.ucenter.service.IFolderService;
+import com.fdkankan.ucenter.service.IScene3dNumService;
+import com.fdkankan.ucenter.service.ISceneCooperationService;
+import com.fdkankan.ucenter.service.ISceneCopyLogService;
+import com.fdkankan.ucenter.service.ISceneEditInfoService;
+import com.fdkankan.ucenter.service.IScenePlusExtService;
+import com.fdkankan.ucenter.service.IScenePlusService;
+import com.fdkankan.ucenter.service.ISceneProEditService;
+import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.service.ISceneService;
+import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.GroupByCount;
 import com.fdkankan.ucenter.vo.response.SceneInfoVo;
 import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import com.fdkankan.ucenter.vo.response.SceneVo;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -33,11 +68,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.io.File;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * pro场景表 服务实现类
@@ -60,8 +90,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     ISceneService sceneService;
     @Autowired
     FdkkLaserService fdkkLaserService;
-    @Autowired
-    UploadToOssUtil uploadToOssUtil;
+    @Resource
+    private FYunFileServiceInterface fYunFileService;
     @Autowired
     IUserIncrementService userIncrementService;
     @Autowired
@@ -483,7 +513,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for(String url : urlList){
             fileMap.put(url, ConstantFilePath.OSS_PREFIX + url.replace(buildModelPath, ""));
         }
-        uploadToOssUtil.uploadMulFiles(fileMap);
+        fYunFileService.uploadMulFiles(fileMap);
 
         FileUtils.delAllFile(newDataSource);
 
@@ -506,7 +536,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             copyList.add(oldViewPath);
         }
         for (String sourcePath : copyList) {
-            uploadToOssUtil.copyFiles(sourcePath,sourcePath.replaceAll(sceneNum,newNum));
+            fYunFileService.copyFileInBucket(sourcePath,sourcePath.replaceAll(sceneNum,newNum));
         }
     }
 
@@ -544,7 +574,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for(String url : urlList){
             map.put(url, url.replace(ConstantFilePath.SCENE_PATH, ""));
         }
-        uploadToOssUtil.uploadMulFiles(map);
+        fYunFileService.uploadMulFiles(map);
     }
 
     @Override
@@ -566,7 +596,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         FileUtils.writeJsonFile(localPath, map);
         if(type.equals("v4")){
-            uploadToOssUtil.upload(localPath,uploadPath);
+            fYunFileService.uploadFile(localPath,uploadPath);
         }
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/SceneUpgradeToV4Service.java

@@ -3,13 +3,9 @@ package com.fdkankan.ucenter.service.impl;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneKind;
-import com.fdkankan.common.constant.SceneResolution;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
@@ -17,17 +13,9 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.bean.SceneUpgradeProgressBean;
 import com.fdkankan.ucenter.common.Result;
-import com.fdkankan.ucenter.entity.ScenePlus;
-import com.fdkankan.ucenter.entity.ScenePlusExt;
 import com.fdkankan.ucenter.entity.ScenePro;
 import com.fdkankan.ucenter.entity.SceneRepairLog;
 import com.fdkankan.ucenter.mapper.ISceneUpgradeMapper;
-import com.fdkankan.ucenter.service.ISceneEditControlsService;
-import com.fdkankan.ucenter.service.ISceneEditInfoExtService;
-import com.fdkankan.ucenter.service.ISceneEditInfoService;
-import com.fdkankan.ucenter.service.IScenePlusExtService;
-import com.fdkankan.ucenter.service.IScenePlusService;
-import com.fdkankan.ucenter.service.ISceneProEditService;
 import com.fdkankan.ucenter.service.ISceneProService;
 import com.fdkankan.ucenter.service.ISceneRepairLogService;
 import com.fdkankan.ucenter.service.ISceneUpgradeToV4Service;
@@ -38,8 +26,6 @@ import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 /**
@@ -62,10 +48,6 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     @Autowired
     private ISceneProService sceneProService;
     @Autowired
-    private IScenePlusExtService scenePlusExtService;
-    @Autowired
-    private IScenePlusService scenePlusService;
-    @Autowired
     private ISceneUpgradeMapper sceneUpgradeMapper;
     @Autowired
     private RedisUtil redisUtil;

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -4,16 +4,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.constant.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.ConstantRegex;
+import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.SecurityUtil;
-import com.fdkankan.common.validation.Variable;
-import com.fdkankan.fyun.qiniu.QiniuUpload;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.ucenter.common.RedisKeyUtil;
+import com.fdkankan.sensitive.Variable;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.ReceiverInfo;
 import com.fdkankan.ucenter.entity.User;
@@ -22,23 +24,25 @@ import com.fdkankan.ucenter.service.ICameraDetailService;
 import com.fdkankan.ucenter.service.IReceiverInfoService;
 import com.fdkankan.ucenter.service.IUserIncrementService;
 import com.fdkankan.ucenter.service.IUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.request.ShipAddressParam;
 import com.fdkankan.ucenter.vo.request.UserParam;
 import com.fdkankan.ucenter.vo.response.UserVo;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
-import org.omg.CORBA.portable.ServantObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.cache.CacheProperties;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * 用户信息表 服务实现类
@@ -50,6 +54,9 @@ import java.util.stream.Collectors;
 @Service
 public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements IUserService {
 
+    @Value("${fyun.host}")
+    private String osssPrefixUrl;
+
     @Autowired
     ICameraDetailService cameraDetailService;
     @Autowired
@@ -58,6 +65,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     IReceiverInfoService receiverInfoService;
     @Autowired
     RedisUtil redisUtil;
+    @Resource
+    private FYunFileServiceInterface fYunFileService;
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
@@ -132,16 +141,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
                 .append("/").append(dbUser.getUserName()).append("/")
                 .append("head").append("_").append(new Date().getTime()).append(".png");
         FileUtils.uploadImg(ConstantFilePath.USER_IMAGES_PATH + sb.toString(), imgdata);
-        dbUser.setHead(ConstantUrl.PREFIX_QINIU + qiniuPath.toString()+"?m="+System.currentTimeMillis());
+        byte[] imageByte = FileUtils.getImageByte(imgdata);
+        //上传头像到oss
+        fYunFileService.uploadFile(imageByte, qiniuPath.toString());
+
+        dbUser.setHead(osssPrefixUrl + qiniuPath.toString()+"?m="+System.currentTimeMillis());
         this.updateById(dbUser);
-        //上传头像到七牛云
-        try {
-            QiniuUpload.delete(qiniuPath.toString());
-        } catch (Exception e) { }
-        if (QiniuUpload.setFileToBucket(qiniuPath.toString(), ConstantFilePath.USER_IMAGES_PATH + sb.toString())) {
-            FileUtils.deleteFile(ConstantFilePath.USER_IMAGES_PATH + sb.toString());
-        }
-        QiniuUpload.refresh(dbUser.getHead());
+
         return dbUser.getHead();
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/VirtualOrderServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.db.response.PageInfo;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.entity.VirtualOrder;
 import com.fdkankan.ucenter.mapper.IVirtualOrderMapper;

src/main/java/com/fdkankan/ucenter/task/TaskService.java

@@ -1,21 +1,18 @@
 package com.fdkankan.ucenter.task;
 
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.common.util.FileUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.constant.QrCodeFilePath;
+import java.io.File;
+import java.util.Date;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 @Component
 @Slf4j
 public class TaskService {
@@ -43,6 +40,9 @@ public class TaskService {
     }
 
     private void delFile(File[] files){
+        if(Objects.isNull(files) || files.length == 0){
+            return;
+        }
         for (File f : files) {
             if(files == null && files.length >0){
                 return;
@@ -53,7 +53,7 @@ public class TaskService {
             String name = f.getName().substring(0,f.getName().lastIndexOf("."));
             if(!redisUtil.hasKey(RedisKeyUtil.QRCODE + name)){
                 log.info("删除文件:{}",f.getPath());
-                FileUtil.delFile(f.getPath());
+                FileUtils.delFile(f.getPath());
             }
         }
     }

src/main/java/com/fdkankan/ucenter/vo/request/AppSceneParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/CameraParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/CartParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/IncrementOrderParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/IncrementParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/InvoiceParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/fdkankan/ucenter/vo/request/OrderParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/fdkankan/ucenter/vo/request/VirtualOrderParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 @Data

src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-test
+        namespace: 4dkankan-v4
         extension-configs:
           - data-id: 4dkankan-center-ucenter.yaml
             group: DEFAULT_GROUP
@@ -16,7 +16,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-redis-config-52.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -28,7 +28,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true