Browse Source

fix文件上传OSS

Eric 2 years ago
parent
commit
b20b1acbcd
25 changed files with 180 additions and 70 deletions
  1. 0 3
      audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java
  2. 1 1
      audio-analysis/src/main/resources/bootstrap-prod.properties
  3. 1 1
      cms/src/main/resources/bootstrap-prod.properties
  4. 2 0
      mec-application/src/main/resources/bootstrap-prod.properties
  5. 15 3
      mec-application/src/main/resources/logback-spring.xml
  6. 13 1
      mec-auth/mec-auth-server/src/main/resources/logback-spring.xml
  7. 0 5
      mec-biz/src/main/java/com/ym/mec/biz/service/UploadFileService.java
  8. 22 17
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java
  9. 7 6
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java
  10. 6 5
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/SoundCompareHandler.java
  11. 7 6
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java
  12. 5 0
      mec-common/common-core/pom.xml
  13. 5 1
      mec-gateway/mec-gateway-web/pom.xml
  14. 13 1
      mec-gateway/mec-gateway-web/src/main/resources/logback-spring.xml
  15. 1 1
      mec-im/src/main/resources/bootstrap-prod.properties
  16. 15 3
      mec-im/src/main/resources/logback-spring.xml
  17. 3 3
      mec-mall/mall-admin/src/main/resources/bootstrap-prod.yml
  18. 14 2
      mec-mall/mall-admin/src/main/resources/logback-spring.xml
  19. 5 1
      mec-mall/mall-common/pom.xml
  20. 3 3
      mec-mall/mall-portal/src/main/resources/bootstrap-prod.yml
  21. 14 2
      mec-mall/mall-portal/src/main/resources/logback-spring.xml
  22. 1 1
      mec-task/src/main/resources/bootstrap-prod.properties
  23. 14 2
      mec-task/src/main/resources/logback-spring.xml
  24. 1 1
      mec-websocket/src/main/resources/bootstrap-prod.properties
  25. 12 1
      mec-websocket/src/main/resources/logback-spring.xml

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

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

+ 1 - 1
audio-analysis/src/main/resources/bootstrap-prod.properties

@@ -11,6 +11,6 @@ spring.cloud.nacos.config.prefix=audio-analysis
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
+spring.cloud.refresh.enabled=true
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
 spring.cloud.nacos.config.enabled=true

+ 1 - 1
cms/src/main/resources/bootstrap-prod.properties

@@ -11,6 +11,6 @@ spring.cloud.nacos.config.prefix=cms
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
+spring.cloud.refresh.enabled=true
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
 spring.cloud.nacos.config.enabled=true

+ 2 - 0
mec-application/src/main/resources/bootstrap-prod.properties

@@ -9,4 +9,6 @@ spring.cloud.nacos.config.prefix=app
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
 spring.cloud.nacos.config.enabled=true
+#Enables autoconfiguration for the refresh scope and associated features
+spring.cloud.refresh.enabled=true
 logging.config=classpath:logback-spring.xml
 logging.config=classpath:logback-spring.xml

+ 15 - 3
mec-application/src/main/resources/logback-spring.xml

@@ -59,7 +59,18 @@
         </encoder>
         </encoder>
     </appender>
     </appender>
 
 
-    <logger name="com.ym.mec" level="INFO"/>
+    <appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+        <appName>mec-app</appName>
+        <redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+        <redisAuth>dyym</redisAuth>
+        <model>sentinel</model>
+        <masterName>mymaster</masterName>
+        <env>prod</env>
+        <redisDb>10</redisDb>
+        <runModel>2</runModel>
+    </appender>
+
+    <logger name="com.ym.mec" level="WARN"/>
 
 
     <logger name="com.ym.mec.thirdparty" level="INFO" additivity="false">
     <logger name="com.ym.mec.thirdparty" level="INFO" additivity="false">
         <appender-ref ref="messagefile"/>
         <appender-ref ref="messagefile"/>
@@ -102,9 +113,10 @@
 
 
     <!--生产环境:输出到文件 -->
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
     <springProfile name="prod">
-        <root level="INFO">
-            <appender-ref ref="stdout"/>
+        <root level="WARN">
+<!--            <appender-ref ref="stdout"/>-->
             <appender-ref ref="file"/>
             <appender-ref ref="file"/>
+            <appender-ref ref="plumelog" />
         </root>
         </root>
     </springProfile>
     </springProfile>
 
 

+ 13 - 1
mec-auth/mec-auth-server/src/main/resources/logback-spring.xml

@@ -27,10 +27,22 @@
 		</encoder>
 		</encoder>
 	</appender>
 	</appender>
 
 
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-auth</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
 	<logger name="com.ym.mec" level="WARN" />
 	<logger name="com.ym.mec" level="WARN" />
 	<root level="WARN">
 	<root level="WARN">
-		<appender-ref ref="stdout" />
+<!--		<appender-ref ref="stdout" />-->
 		<appender-ref ref="file" />
 		<appender-ref ref="file" />
+		<appender-ref ref="plumelog" />
 	</root>
 	</root>
 
 
 </configuration>
 </configuration>

+ 0 - 5
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.thirdparty.entity.UploadSign;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.exception.BizException;
 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 com.ym.mec.util.upload.UploadUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.IOUtils;
@@ -27,9 +25,6 @@ import java.io.*;
 public class UploadFileService {
 public class UploadFileService {
 
 
 	@Autowired
 	@Autowired
-	private StoragePluginContext storagePluginContext;
-
-	@Autowired
 	private OssPluginContext ossPluginContext;
 	private OssPluginContext ossPluginContext;
 
 
 	/** 最大上传大小,单位kb */
 	/** 最大上传大小,单位kb */

+ 22 - 17
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.Optional;
 import java.util.stream.Collectors;
 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.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 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.biz.service.VipGroupService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.eseal.ESealPlugin;
 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.RealnameAuthenticationPluginContext;
 import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -133,9 +133,6 @@ public class ContractServiceImpl implements ContractService {
     private ESealPlugin eSealPlugin;
     private ESealPlugin eSealPlugin;
 
 
     @Autowired
     @Autowired
-    private StoragePluginContext storagePluginContext;
-
-    @Autowired
     private GoodsService goodsService;
     private GoodsService goodsService;
 
 
     @Autowired
     @Autowired
@@ -169,6 +166,8 @@ public class ContractServiceImpl implements ContractService {
 
 
     @Autowired
     @Autowired
     private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
     private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
 
     private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
     private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
 
@@ -318,8 +317,9 @@ public class ContractServiceImpl implements ContractService {
         Date date = new Date();
         Date date = new Date();
         // 上传到oss
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
         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 sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
         sysUserContracts.setCreateTime(date);
@@ -468,8 +468,9 @@ public class ContractServiceImpl implements ContractService {
 
 
         // 上传到oss
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
         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 sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
         sysUserContracts.setCreateTime(date);
@@ -644,8 +645,9 @@ public class ContractServiceImpl implements ContractService {
 
 
         // 上传到oss
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
         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 sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
         sysUserContracts.setCreateTime(date);
@@ -887,8 +889,9 @@ public class ContractServiceImpl implements ContractService {
 
 
         // 上传到oss
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
         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 sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
         sysUserContracts.setCreateTime(date);
@@ -1043,8 +1046,9 @@ public class ContractServiceImpl implements ContractService {
 
 
         // 上传到oss
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
         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 sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
         sysUserContracts.setCreateTime(date);
@@ -1244,8 +1248,9 @@ public class ContractServiceImpl implements ContractService {
 
 
         //上传到oss
         //上传到oss
         String dateStrOss = dateFormatOss.format(date);
         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);
         FileUtils.deleteQuietly(srcFile);
 
 

+ 7 - 6
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.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 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.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 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.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 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.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.excel.POIUtil;
 import com.ym.mec.util.excel.POIUtil;
@@ -73,8 +73,6 @@ public class ExportServiceImpl implements ExportService {
     @Autowired
     @Autowired
     private SysConfigDao sysConfigDao;
     private SysConfigDao sysConfigDao;
     @Autowired
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private ManagerDownloadDao managerDownloadDao;
     private ManagerDownloadDao managerDownloadDao;
     @Autowired
     @Autowired
     private CooperationOrganDao cooperationOrganDao;
     private CooperationOrganDao cooperationOrganDao;
@@ -184,6 +182,8 @@ public class ExportServiceImpl implements ExportService {
     private StudentTeacherMapperDao studentTeacherMapperDao;
     private StudentTeacherMapperDao studentTeacherMapperDao;
     @Autowired
     @Autowired
     private TeacherCloudCourseReportService teacherCloudCourseReportService;
     private TeacherCloudCourseReportService teacherCloudCourseReportService;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
 
     private static final ExecutorService exportExecutorService = Executors.newFixedThreadPool(10);
     private static final ExecutorService exportExecutorService = Executors.newFixedThreadPool(10);
     @Autowired
     @Autowired
@@ -2978,8 +2978,9 @@ public class ExportServiceImpl implements ExportService {
             fileOutputStream.getFD().sync();
             fileOutputStream.getFD().sync();
             fileOutputStream.close();
             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.setFileUrl(url);
             managerDownload.setStatus(1);
             managerDownload.setStatus(1);

+ 6 - 5
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 be.tarsos.dsp.util.PitchConverter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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.config.SoundCompareConfig;
 import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
 import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
 import com.ym.mec.biz.dal.dto.*;
 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.biz.service.WebSocketEventHandler;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.exception.BizException;
 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 com.ym.mec.util.upload.UploadUtil;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -65,11 +65,11 @@ public class SoundCompareHandler implements WebSocketEventHandler {
     public static final SoundCompareConfig soundCompareConfig = new SoundCompareConfig();
     public static final SoundCompareConfig soundCompareConfig = new SoundCompareConfig();
 
 
     @Autowired
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private SysMusicCompareRecordService sysMusicCompareRecordService;
     private SysMusicCompareRecordService sysMusicCompareRecordService;
     @Autowired
     @Autowired
     private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
     private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
 
     public SoundCompareHandler() {
     public SoundCompareHandler() {
         WebSocketHandler.regist(WebsocketTypeEnum.SOUND_COMPARE, this);
         WebSocketHandler.regist(WebsocketTypeEnum.SOUND_COMPARE, this);
@@ -291,7 +291,8 @@ public class SoundCompareHandler implements WebSocketEventHandler {
             String url = null;
             String url = null;
             try {
             try {
                 String folder = UploadUtil.getFileFloder();
                 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) {
             } catch (Exception e) {
                 LOGGER.error("录音文件上传失败:{}", e);
                 LOGGER.error("录音文件上传失败:{}", e);
             }
             }

+ 7 - 6
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 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.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 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.service.IdGeneratorService;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 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.thirdparty.yqpay.DateUtils;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.freemarker.FreemarkerTemplateEngine;
 import com.ym.mec.util.freemarker.FreemarkerTemplateEngine;
@@ -164,8 +164,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     @Autowired
     @Autowired
     private SysAreaService sysAreaService;
     private SysAreaService sysAreaService;
     @Autowired
     @Autowired
-    private StoragePluginContext storagePluginContext;
-    @Autowired
     private TenantPreJoinService tenantPreJoinService;
     private TenantPreJoinService tenantPreJoinService;
     @Autowired
     @Autowired
     private TenantContractRecordService tenantContractRecordService;
     private TenantContractRecordService tenantContractRecordService;
@@ -173,6 +171,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private SysUserTenantService sysUserTenantService;
     private SysUserTenantService sysUserTenantService;
     @Autowired
     @Autowired
     private TenantContractTemplateService tenantContractTemplateService;
     private TenantContractTemplateService tenantContractTemplateService;
+    @Autowired
+    private OssPluginContext ossPluginContext;
 
 
     @Value("${contract.baseDir:/var/pdf}")
     @Value("${contract.baseDir:/var/pdf}")
     private String contractBaseDir;
     private String contractBaseDir;
@@ -769,8 +769,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         }
         }
         //上传到云服务器后获取上传地址
         //上传到云服务器后获取上传地址
         String dateStrOss = DateUtils.formatDate(now, "yyyy/MM/dd");
         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生成的文件缓存
         //删除本次PDF生成的文件缓存
         FileUtils.deleteQuietly(srcFile);
         FileUtils.deleteQuietly(srcFile);
         //删除缓存
         //删除缓存

+ 5 - 0
mec-common/common-core/pom.xml

@@ -17,6 +17,11 @@
 	</properties>
 	</properties>
 
 
 	<dependencies>
 	<dependencies>
+		<dependency>
+			<groupId>com.plumelog</groupId>
+			<artifactId>plumelog-logback</artifactId>
+			<version>3.5.3</version>
+		</dependency>
 
 
 		<dependency>
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<groupId>org.mybatis.spring.boot</groupId>

+ 5 - 1
mec-gateway/mec-gateway-web/pom.xml

@@ -24,7 +24,11 @@
 		<!--redis限流 -->
 		<!--redis限流 -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis-reactive</artifactId> 
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis-reactive</artifactId> 
 			</dependency> -->
 			</dependency> -->
-
+		<dependency>
+			<groupId>com.plumelog</groupId>
+			<artifactId>plumelog-logback</artifactId>
+			<version>3.5.3</version>
+		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

+ 13 - 1
mec-gateway/mec-gateway-web/src/main/resources/logback-spring.xml

@@ -27,6 +27,17 @@
 		</encoder>
 		</encoder>
 	</appender>
 	</appender>
 
 
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-gateway</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
 	<logger name="com.ym.mec" level="INFO" />
 	<logger name="com.ym.mec" level="INFO" />
 
 
 	<!--本地环境:打印控制台 -->
 	<!--本地环境:打印控制台 -->
@@ -55,8 +66,9 @@
 	<!--生产环境:输出到文件 -->
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 	<springProfile name="prod">
 		<root level="WARN">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
 		</root>
 		</root>
 	</springProfile>
 	</springProfile>
 
 

+ 1 - 1
mec-im/src/main/resources/bootstrap-prod.properties

@@ -11,6 +11,6 @@ spring.cloud.nacos.config.prefix=im
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
+spring.cloud.refresh.enabled=true
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
 spring.cloud.nacos.config.enabled=true

+ 15 - 3
mec-im/src/main/resources/logback-spring.xml

@@ -27,7 +27,18 @@
         </encoder>
         </encoder>
     </appender>
     </appender>
 
 
-    <logger name="com.ym.mec" level="INFO" />
+    <appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+        <appName>mec-im</appName>
+        <redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+        <redisAuth>dyym</redisAuth>
+        <model>sentinel</model>
+        <masterName>mymaster</masterName>
+        <env>prod</env>
+        <redisDb>10</redisDb>
+        <runModel>2</runModel>
+    </appender>
+
+    <logger name="com.ym.mec" level="WARN" />
 
 
     <!--本地环境:打印控制台 -->
     <!--本地环境:打印控制台 -->
     <springProfile name="local">
     <springProfile name="local">
@@ -60,9 +71,10 @@
 
 
     <!--生产环境:输出到文件 -->
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
     <springProfile name="prod">
-        <root level="INFO">
-            <appender-ref ref="stdout" />
+        <root level="WARN">
+<!--            <appender-ref ref="stdout" />-->
             <appender-ref ref="file" />
             <appender-ref ref="file" />
+            <appender-ref ref="plumelog" />
         </root>
         </root>
     </springProfile>
     </springProfile>
 
 

+ 3 - 3
mec-mall/mall-admin/src/main/resources/bootstrap-prod.yml

@@ -7,6 +7,6 @@ spring:
         group: DEFAULT_GROUP
         group: DEFAULT_GROUP
         prefix: mall-admin
         prefix: mall-admin
         file-extension: yaml
         file-extension: yaml
-        refresh:
-          enabled: true
-        enabled: true
+        enabled: true
+    refresh:
+      enabled: true

+ 14 - 2
mec-mall/mall-admin/src/main/resources/logback-spring.xml

@@ -27,7 +27,18 @@
 		</encoder>
 		</encoder>
 	</appender>
 	</appender>
 
 
-	<logger name="com.yonge" level="INFO" />
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-mall-admin</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
+	<logger name="com.yonge" level="WARN" />
 
 
 	<!--本地环境:打印控制台 -->
 	<!--本地环境:打印控制台 -->
 	<springProfile name="local">
 	<springProfile name="local">
@@ -61,8 +72,9 @@
 	<!--生产环境:输出到文件 -->
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 	<springProfile name="prod">
 		<root level="WARN">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
 		</root>
 		</root>
 	</springProfile>
 	</springProfile>
 
 

+ 5 - 1
mec-mall/mall-common/pom.xml

@@ -18,7 +18,11 @@
     </parent>
     </parent>
 
 
     <dependencies>
     <dependencies>
-
+        <dependency>
+            <groupId>com.plumelog</groupId>
+            <artifactId>plumelog-logback</artifactId>
+            <version>3.5.3</version>
+        </dependency>
         <dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
             <artifactId>druid-spring-boot-starter</artifactId>

+ 3 - 3
mec-mall/mall-portal/src/main/resources/bootstrap-prod.yml

@@ -7,9 +7,9 @@ spring:
         group: DEFAULT_GROUP
         group: DEFAULT_GROUP
         prefix: mall-portal
         prefix: mall-portal
         file-extension: yaml
         file-extension: yaml
-        refresh:
-          enabled: true
         enabled: true
         enabled: true
     alibaba:
     alibaba:
       seata:
       seata:
-        tx-service-group: default_tx_group
+        tx-service-group: default_tx_group
+    refresh:
+      enabled: true

+ 14 - 2
mec-mall/mall-portal/src/main/resources/logback-spring.xml

@@ -27,7 +27,18 @@
 		</encoder>
 		</encoder>
 	</appender>
 	</appender>
 
 
-	<logger name="com.yonge" level="info" />
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-mall-portal</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
+	<logger name="com.yonge" level="WARN" />
 
 
 	<!--本地环境:打印控制台 -->
 	<!--本地环境:打印控制台 -->
 	<springProfile name="local">
 	<springProfile name="local">
@@ -61,8 +72,9 @@
 	<!--生产环境:输出到文件 -->
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 	<springProfile name="prod">
 		<root level="WARN">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
 		</root>
 		</root>
 	</springProfile>
 	</springProfile>
 
 

+ 1 - 1
mec-task/src/main/resources/bootstrap-prod.properties

@@ -11,6 +11,6 @@ spring.cloud.nacos.config.prefix=task
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
+spring.cloud.refresh.enabled=true
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
 spring.cloud.nacos.config.enabled=true

+ 14 - 2
mec-task/src/main/resources/logback-spring.xml

@@ -27,7 +27,18 @@
 		</encoder>
 		</encoder>
 	</appender>
 	</appender>
 
 
-	<logger name="com.ym.mec" level="debug" />
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-task</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
+
+	<logger name="com.ym.mec" level="WARN" />
 
 
 	<!--本地环境:打印控制台 -->
 	<!--本地环境:打印控制台 -->
 	<springProfile name="local">
 	<springProfile name="local">
@@ -55,8 +66,9 @@
 	<!--生产环境:输出到文件 -->
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 	<springProfile name="prod">
 		<root level="WARN">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
 		</root>
 		</root>
 	</springProfile>
 	</springProfile>
 
 

+ 1 - 1
mec-websocket/src/main/resources/bootstrap-prod.properties

@@ -11,6 +11,6 @@ spring.cloud.nacos.config.prefix=websocket
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
 #\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
+spring.cloud.refresh.enabled=true
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
 spring.cloud.nacos.config.enabled=true

+ 12 - 1
mec-websocket/src/main/resources/logback-spring.xml

@@ -43,6 +43,16 @@
 		</encoder>
 		</encoder>
 	</appender>
 	</appender>
 
 
+	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
+		<appName>mec-websocket</appName>
+		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
+		<redisAuth>dyym</redisAuth>
+		<model>sentinel</model>
+		<masterName>mymaster</masterName>
+		<env>prod</env>
+		<redisDb>10</redisDb>
+		<runModel>2</runModel>
+	</appender>
 	<logger name="com.ym.mec" level="INFO" />
 	<logger name="com.ym.mec" level="INFO" />
 
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
 	<logger name="com.ym.mec.thirdparty" level="INFO"
@@ -75,8 +85,9 @@
 	<!--生产环境:输出到文件 -->
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 	<springProfile name="prod">
 		<root level="WARN">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="file" />
+			<appender-ref ref="plumelog" />
 		</root>
 		</root>
 	</springProfile>
 	</springProfile>