Merge branch 'feature/0908-oss' into saas-1009

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -3,6 +3,8 @@ package com.yonge.netty.server.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONPath;
+import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
 import com.ym.mec.biz.dal.enums.DeviceTypeEnum;
 import com.ym.mec.biz.dal.enums.FeatureType;
@@ -41,6 +43,8 @@ public class AudioCompareHandler implements MessageHandler {
 	
 	private static final Logger LOGGER = LoggerFactory.getLogger(AudioCompareHandler.class);
 
+    @Autowired
+    private OssPluginContext ossPluginContext;
 	@Autowired
 	private UserChannelContextService userChannelContextService;
 
@@ -192,7 +196,8 @@ public class AudioCompareHandler implements MessageHandler {
 		            String url = null;
 		            try {
 		                String folder = UploadUtil.getFileFloder();
-		                url = storagePluginContext.asyncUploadFile(KS3StoragePlugin.PLUGIN_NAME,"cloud-coach/" + folder, waveFileProcessor.getFile(), true);
+//                        url = storagePluginContext.asyncUploadFile(KS3StoragePlugin.PLUGIN_NAME,"cloud-coach/" + folder, waveFileProcessor.getFile(), true);
+		                url = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).asyncUploadFile("cloud-coach/" + folder, waveFileProcessor.getFile(), true);
 		            } catch (Exception e) {
 		                LOGGER.error("录音文件上传失败：{}", e);
 		            }

mec-biz/src/main/java/com/ym/mec/biz/service/UploadFileService.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.alibaba.fastjson.JSON;
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
 import com.ym.mec.thirdparty.entity.UploadSign;
 import com.ym.mec.common.entity.UploadReturnBean;
@@ -59,7 +60,7 @@ public class UploadFileService {
 			return uploadReturn;
 		}
 
-		String staticFloder = "";
+		String staticFloder = "daya";
 
 		String folder = UploadUtil.getFileFloder();
 		String filePath = UploadUtil.getFilePath(root, staticFloder, folder);
@@ -71,7 +72,9 @@ public class UploadFileService {
 		}
 
 		//String url = storagePlugin.uploadFile(staticFloder + folder, file);
-		String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME,staticFloder + folder, file);
+		//String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME,staticFloder + folder, file);
+
+		String url = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(staticFloder + folder, file);
 
 		FileUtils.deleteQuietly(file);
 		uploadReturn.setStatus(true);
@@ -92,11 +95,13 @@ public class UploadFileService {
 			return uploadReturn;
 		}
 
-		String staticFloder = "";
+		String staticFloder = "daya";
 		String folder = UploadUtil.getFileFloder();
 		String filePath = UploadUtil.getFilePath(root, staticFloder, folder);
 		File file = uploadFile(in, filePath, fileName);
-		String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME,staticFloder + folder, file);
+		//String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME,staticFloder + folder, file);
+
+		String url = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(staticFloder + folder, file);
 
 		FileUtils.deleteQuietly(file);