From 7d0facde2378bf5e3709306ed0dfbd9f59967d48 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Mon, 28 Mar 2022 17:47:27 +0800
Subject: [PATCH] Disable the media module by default

---
 src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
index eb6bc5e..3d25fb6 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java
@@ -15,6 +15,7 @@
 import com.dji.sample.wayline.model.WaylineFileEntity;
 import com.dji.sample.wayline.model.WaylineQueryParam;
 import com.dji.sample.wayline.service.IWaylineFileService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,7 @@
  */
 @Service
 @Transactional
+@Slf4j
 public class WaylineFileServiceImpl implements IWaylineFileService {
 
     @Autowired
@@ -41,7 +43,8 @@
     private IOssService ossService;
 
     @Autowired
-    private void setOssService(@Autowired AliyunOssServiceImpl aliyunOssService, @Autowired MinIOServiceImpl minIOService) {
+    private void setOssService(@Autowired(required = false) AliyunOssServiceImpl aliyunOssService,
+                               @Autowired(required = false) MinIOServiceImpl minIOService) {
         if (AliyunOSSConfiguration.enable) {
             this.ossService = aliyunOssService;
             return;
@@ -50,7 +53,7 @@
             this.ossService = minIOService;
             return;
         }
-        throw new NullPointerException("ossService is null.");
+        log.error("ossService is null.");
     }
 
     @Override

--
Gitblit v1.9.3