fix文件上传OSS

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

@@ -54,9 +54,6 @@ public class AudioCompareHandler implements MessageHandler {
 	@Autowired
 	private SysMusicCompareRecordService sysMusicCompareRecordService;
 	
-    @Autowired
-    private StoragePluginContext storagePluginContext;
-
 	/**
 	 * @describe 采样率
 	 */

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

@@ -7,8 +7,6 @@ import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
 import com.ym.mec.thirdparty.entity.UploadSign;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
-import com.ym.mec.thirdparty.storage.provider.KS3StoragePlugin;
 import com.ym.mec.util.upload.UploadUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -27,9 +25,6 @@ import java.io.*;
 public class UploadFileService {
 
 	@Autowired
-	private StoragePluginContext storagePluginContext;
-
-	@Autowired
 	private OssPluginContext ossPluginContext;
 
 	/** 最大上传大小，单位kb */

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -16,6 +16,8 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -78,8 +80,6 @@ import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.eseal.ESealPlugin;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
-import com.ym.mec.thirdparty.storage.provider.KS3StoragePlugin;
 import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
 import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.ym.mec.util.date.DateUtil;
@@ -133,9 +133,6 @@ public class ContractServiceImpl implements ContractService {
     private ESealPlugin eSealPlugin;
 
     @Autowired
-    private StoragePluginContext storagePluginContext;
-
-    @Autowired
     private GoodsService goodsService;
 
     @Autowired
@@ -169,6 +166,8 @@ public class ContractServiceImpl implements ContractService {
 
     @Autowired
     private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
     private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
@@ -318,8 +317,9 @@ public class ContractServiceImpl implements ContractService {
         Date date = new Date();
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = "users/" + dateStrOss + "/" + DateUtil.getHour(date);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/users/" + dateStrOss + "/" + DateUtil.getHour(date);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
 
         SysUserContracts sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
@@ -468,8 +468,9 @@ public class ContractServiceImpl implements ContractService {
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = "musicCourses/" + dateStrOss + "/" + DateUtil.getHour(date);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/musicCourses/" + dateStrOss + "/" + DateUtil.getHour(date);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
 
         SysUserContracts sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
@@ -644,8 +645,9 @@ public class ContractServiceImpl implements ContractService {
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = vipCourses + dateStrOss + "/" + DateUtil.getHour(date);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/" + vipCourses + dateStrOss + "/" + DateUtil.getHour(date);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
 
         SysUserContracts sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
@@ -887,8 +889,9 @@ public class ContractServiceImpl implements ContractService {
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = "practice/" + dateStrOss + "/" + DateUtil.getHour(date);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/practice/" + dateStrOss + "/" + DateUtil.getHour(date);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
 
         SysUserContracts sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
@@ -1043,8 +1046,9 @@ public class ContractServiceImpl implements ContractService {
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = "product/" + dateStrOss + "/" + DateUtil.getHour(date);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/product/" + dateStrOss + "/" + DateUtil.getHour(date);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
 
         SysUserContracts sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
@@ -1244,8 +1248,9 @@ public class ContractServiceImpl implements ContractService {
 
         //上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = "oa/" + dateStrOss + "/" + DateUtil.getHour(date);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/oa/" + dateStrOss + "/" + DateUtil.getHour(date);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
 
         FileUtils.deleteQuietly(srcFile);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -20,8 +22,6 @@ import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
-import com.ym.mec.thirdparty.storage.provider.KS3StoragePlugin;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
@@ -73,8 +73,6 @@ public class ExportServiceImpl implements ExportService {
     @Autowired
     private SysConfigDao sysConfigDao;
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private ManagerDownloadDao managerDownloadDao;
     @Autowired
     private CooperationOrganDao cooperationOrganDao;
@@ -184,6 +182,8 @@ public class ExportServiceImpl implements ExportService {
     private StudentTeacherMapperDao studentTeacherMapperDao;
     @Autowired
     private TeacherCloudCourseReportService teacherCloudCourseReportService;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
     private static final ExecutorService exportExecutorService = Executors.newFixedThreadPool(10);
     @Autowired
@@ -2978,8 +2978,9 @@ public class ExportServiceImpl implements ExportService {
             fileOutputStream.getFD().sync();
             fileOutputStream.close();
 
-            String folder = "download/" + UploadUtil.getFileFloder();
-            String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, folder, file);
+            String folder = "daya/download/" + UploadUtil.getFileFloder();
+            //String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, folder, file);
+            String url = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(folder, file);
             //把记录插入下载表
             managerDownload.setFileUrl(url);
             managerDownload.setStatus(1);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SoundCompareHandler.java

@@ -6,6 +6,8 @@ import be.tarsos.dsp.pitch.PitchProcessor;
 import be.tarsos.dsp.util.PitchConverter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.ym.mec.biz.dal.config.SoundCompareConfig;
 import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
 import com.ym.mec.biz.dal.dto.*;
@@ -17,8 +19,6 @@ import com.ym.mec.biz.service.SysMusicCompareRecordService;
 import com.ym.mec.biz.service.WebSocketEventHandler;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
-import com.ym.mec.thirdparty.storage.provider.KS3StoragePlugin;
 import com.ym.mec.util.upload.UploadUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,11 +65,11 @@ public class SoundCompareHandler implements WebSocketEventHandler {
     public static final SoundCompareConfig soundCompareConfig = new SoundCompareConfig();
 
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private SysMusicCompareRecordService sysMusicCompareRecordService;
     @Autowired
     private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
     public SoundCompareHandler() {
         WebSocketHandler.regist(WebsocketTypeEnum.SOUND_COMPARE, this);
@@ -291,7 +291,8 @@ public class SoundCompareHandler implements WebSocketEventHandler {
             String url = null;
             try {
                 String folder = UploadUtil.getFileFloder();
-                url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME,"cloud-coach/" + folder, userSoundInfoMap.get(phone).getFile());
+                //url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME,"cloud-coach/" + folder, userSoundInfoMap.get(phone).getFile());
+                url = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile("daya/cloud-coach/" + folder, userSoundInfoMap.get(phone).getFile());
             } catch (Exception e) {
                 LOGGER.error("录音文件上传失败：{}", e);
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -27,6 +27,8 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -111,8 +113,6 @@ import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
-import com.ym.mec.thirdparty.storage.provider.KS3StoragePlugin;
 import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.freemarker.FreemarkerTemplateEngine;
@@ -164,8 +164,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     @Autowired
     private SysAreaService sysAreaService;
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private TenantPreJoinService tenantPreJoinService;
     @Autowired
     private TenantContractRecordService tenantContractRecordService;
@@ -173,6 +171,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private SysUserTenantService sysUserTenantService;
     @Autowired
     private TenantContractTemplateService tenantContractTemplateService;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
     @Value("${contract.baseDir:/var/pdf}")
     private String contractBaseDir;
@@ -769,8 +769,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         }
         //上传到云服务器后获取上传地址
         String dateStrOss = DateUtils.formatDate(now, "yyyy/MM/dd");
-        dateStrOss = "oa/" + dateStrOss + "/" + DateUtil.getHour(now);
-        String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        dateStrOss = "daya/oa/" + dateStrOss + "/" + DateUtil.getHour(now);
+        //String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
         //删除本次PDF生成的文件缓存
         FileUtils.deleteQuietly(srcFile);
         //删除缓存