Merge branch 'feature/1105-oss-fix' into develop-new

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

@@ -43,8 +43,6 @@ import com.yonge.netty.entity.MusicXmlNote;
 import com.yonge.netty.server.handler.NettyChannelManager;
 import com.yonge.netty.server.handler.message.MessageHandler;
 import com.yonge.netty.server.processor.WaveformWriter;
-import com.yonge.toolset.thirdparty.storage.StoragePluginContext;
-import com.yonge.toolset.thirdparty.storage.provider.KS3StoragePlugin;
 import com.yonge.toolset.utils.upload.UploadUtil;
 
 @Component
@@ -65,9 +63,6 @@ public class AudioCompareHandler implements MessageHandler {
     private SysUserFeignService sysUserFeignService;
 
     @Autowired
-    private StoragePluginContext storagePluginContext;
-
-    @Autowired
     private OssPluginContext ossPluginContext;
 
 	/**

cooleshow-app/src/main/resources/logback-spring.xml

@@ -34,7 +34,7 @@
 		<redisDb>10</redisDb>
 		<runModel>2</runModel>
 	</appender>
-	<logger name="com.yonge" level="DEBUG" />
+	<logger name="com.yonge" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
 	<springProfile name="local">

cooleshow-auth/auth-server/src/main/resources/logback-spring.xml

@@ -37,7 +37,7 @@
 		<runModel>2</runModel>
 	</appender>
 
-	<logger name="com.yonge" level="DEBUG" />
+	<logger name="com.yonge" level="INFO" />
 	<springProfile name="pre">
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UploadFileService.java

@@ -2,12 +2,11 @@ package com.yonge.cooleshow.biz.dal.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.yonge.cooleshow.common.entity.UploadReturnBean;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.entity.UploadSign;
-import com.yonge.toolset.thirdparty.storage.StoragePluginContext;
-import com.yonge.toolset.thirdparty.storage.provider.KS3StoragePlugin;
 import com.yonge.toolset.utils.upload.UploadUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -31,8 +30,6 @@ import java.io.InputStream;
 public class UploadFileService {
 
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private OssPluginContext ossPluginContext;
 
     /**
@@ -68,7 +65,7 @@ public class UploadFileService {
             return uploadReturn;
         }
 
-        String staticFloder = "";
+        String staticFloder = "klx";
 
         String folder = UploadUtil.getFileFloder();
         String filePath = UploadUtil.getFilePath(root, staticFloder, folder);
@@ -80,7 +77,8 @@ 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);
@@ -101,11 +99,12 @@ public class UploadFileService {
             return uploadReturn;
         }
 
-        String staticFloder = "";
+        String staticFloder = "klx";
         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);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java

@@ -1,5 +1,7 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import com.microsvc.toolkit.middleware.oss.OssPluginContext;
+import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.enums.CertificateTypeEnum;
 import com.yonge.cooleshow.biz.dal.entity.ContractTemplate;
@@ -13,8 +15,6 @@ import com.yonge.cooleshow.common.enums.ContractTemplateTypeEnum;
 import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.eseal.ESealPlugin;
-import com.yonge.toolset.thirdparty.storage.StoragePluginContext;
-import com.yonge.toolset.thirdparty.storage.provider.KS3StoragePlugin;
 import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPluginContext;
 import com.yonge.toolset.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.date.DateUtil;
@@ -58,7 +58,7 @@ public class ContractServiceImpl implements ContractService {
     @Autowired
     private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
     @Autowired
-    private StoragePluginContext storagePluginContext;
+    private OssPluginContext ossPluginContext;
     @Autowired
     private ESealPlugin eSealPlugin;
 
@@ -178,7 +178,8 @@ 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);
+        String pdfFilePath = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(dateStrOss, srcFile);
+        // String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
         FileUtils.deleteQuietly(srcFile);
         return HttpResponseResult.succeed(pdfFilePath);
     }