Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

yumeng 4 rokov pred
rodič
commit
22b467fabc

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/UReportExportRest.java

@@ -16,7 +16,7 @@ public class UReportExportRest implements IUReportExportService {
     @Autowired
     private RestTemplate restTemplate;
 
-    private static final String  outputDir=System.getProperty("user.dir")+ File.separator + "uReport"+File.separator;
+    private static final String  outputDir="/data/file/report"+ File.separator + "uReport"+File.separator;
 
     @Override
     public void exportExcel(String fileName) {

+ 2 - 2
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/SendDailyUReportJob.java

@@ -40,13 +40,13 @@ public class SendDailyUReportJob {
                  uReportSubscriber.forEach(sender->{
                      String receiver=CorpUserService.getEmailByUserId(sender.getSender());
                      emailSendMsgHandle.SendAttachment(receiver,title,content,
-                             new File(System.getProperty("user.dir")+ File.separator + "uReport"+File.separator+uReport.getString("name")
+                             new File("/data/file/report"+ File.separator + "uReport"+File.separator+uReport.getString("name")
                                      .replace("ureport.xml","")+"xlsx"));
                  });
              }
         });
         //发完全部订阅,删除文件
-        File file =new File(System.getProperty("user.dir")+ File.separator + "uReport");
+        File file =new File(System.getProperty("/data/file/report")+ File.separator + "uReport");
             File[] files=file.listFiles();
             if(files!=null&&files.length>0){
                 for (File f: files){

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouAccountReportCtrl.java

@@ -137,8 +137,8 @@ public class KuaiShouAccountReportCtrl {
             OutputStream os = response.getOutputStream();
             ExportExcelUtils eeu = new ExportExcelUtils();
             XSSFWorkbook workbook = new XSSFWorkbook();
-            eeu.exportExcel(workbook, 0, "头条素材报表", headers, excelList);
-            HttpUtils.setResponseHeader(response, "头条素材报表.xlsx");
+            eeu.exportExcel(workbook, 0, "快手素材报表", headers, excelList);
+            HttpUtils.setResponseHeader(response, "快手素材报表.xlsx");
             workbook.write(os);
             os.flush();
             os.close();