Quellcode durchsuchen

删除接口优化

dsx vor 2 Jahren
Ursprung
Commit
b893e4cc8e

+ 2 - 2
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -133,8 +133,8 @@ public class SceneController extends BaseController {
 
     @PostMapping("/copyScene")
     public ResultData copyScene(@RequestBody SceneParamVO param) throws Exception {
-        String username = JwtUtil.getUsername(getToken());
-        sceneService.copyScene(param.getNewNum(), param.getSceneNum(),username);
+//        String username = JwtUtil.getUsername(getToken());
+        sceneService.copyScene(param.getNewNum(), param.getSceneNum(),null);
         return ResultData.ok();
     }
 

+ 4 - 4
src/main/java/com/fdkankan/scene/controller/SceneMarkShapeController.java

@@ -40,8 +40,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class SceneMarkShapeController extends BaseController
 {
-    @Value("${queue.scene.yolov5-detect-queue}")
-    private String yolov5DetectQueue;
+//    @Value("${queue.scene.yolov5-detect-queue}")
+//    private String yolov5DetectQueue;
     @Autowired
     private ISceneMarkShapeService sceneMarkShapeService;
     @Resource
@@ -50,9 +50,9 @@ public class SceneMarkShapeController extends BaseController
     private IScenePlusService scenePlusService;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
-    @Value("${fyun.host}")
+    @Value("${fyun.host:xxx}")
     private String ossUrlPrefix;
-    @Value("${main.url}")
+    @Value("${main.url:xxx}")
     private String mainUrl;
 
 

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneCleanOrigServiceImpl.java

@@ -40,7 +40,7 @@ import java.util.Map;
 @Service
 public class SceneCleanOrigServiceImpl extends ServiceImpl<ISceneCleanOrigMapper, SceneCleanOrig> implements ISceneCleanOrigService {
 
-    @Value("${scene.cleanOrig.month}")
+    @Value("${scene.cleanOrig.month:6}")
     private Integer cleanOrigMonth;
 
     @Autowired

+ 2 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -44,10 +44,10 @@ import java.util.Objects;
 @Service
 public class SceneEditServiceImpl implements ISceneEditService {
 
-    @Value("${4dkk.manageService.basePath}")
+    @Value("${4dkk.manageService.basePath:xxx}")
     private String manageServiceUrl;
 
-    @Value("${4dkk.manageService.api.getServiceUpTip}")
+    @Value("${4dkk.manageService.api.getServiceUpTip:xxx}")
     private String getServiceUpTipApi;
 
     @Autowired

+ 3 - 3
src/main/java/com/fdkankan/scene/service/impl/SceneMarkShapeServiceImpl.java

@@ -40,9 +40,9 @@ import java.util.List;
 public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, SceneMarkShape> implements ISceneMarkShapeService {
 //    @Autowired
 //    private RabbitMqProducer rabbitMqProducer;
-    @Value("${queue.scene.yolov5-train-queue}")
-    private String yolov5TrainQueue;
-    @Value("${main.url}")
+//    @Value("${queue.scene.yolov5-train-queue}")
+//    private String yolov5TrainQueue;
+    @Value("${main.url:xxx}")
     private String mainUrl;
 
     @Override

+ 3 - 1
src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -425,7 +425,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         //删除原始资源文件
         for (Long key : plusMap.keySet()) {
             ScenePlusExt ext = plusMap.get(key);
-            ossUtil.deleteObject(ext.getDataSource());
+            if(StrUtil.isNotEmpty(ext.getDataSource()) && ext.getDataSource().length() > 5){
+                FileUtil.del(ext.getDataSource());
+            }
         }
 
     }

+ 2 - 2
src/main/java/com/fdkankan/scene/util/OssBodySegmentUtil.java

@@ -22,10 +22,10 @@ public class OssBodySegmentUtil {
     @Value("${oss.bodySegment.imagesegPoint:imageseg.cn-shanghai.aliyuncs.com}")
     private String imagesegEndPoint;
 
-    @Value("${fyun.key}")
+    @Value("${fyun.key:xxx}")
     private String accessKeyId;
 
-    @Value("${fyun.secret}")
+    @Value("${fyun.secret:xxx}")
     private String accessKeySecret;
 
     @Value("${oss.bodySegment.bucket:4dkankan-huadong}")