Merge remote-tracking branch 'origin/wb' into wb

jinpengyong

2023-09-27 9334c8b308436e5f698c89893ad47aca4dfabaa5

Merge remote-tracking branch 'origin/wb' into wb

 screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java

@@ -100,7 +100,7 @@
    }

    private String getFilePath(String sysCode) {
        return sysCode.concat(StringUtils.SLASH).concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
        return sysCode.concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
    }

    public void storageFile(MultipartFile file, String originalFilename, String targetFolder) {

 screen-api/src/main/resources/application-cjl.yml

@@ -125,10 +125,14 @@
      - /webjars/**
      - /verificationCode/**
      - /static/**
      - /doc.html
      - /file/preview/**

AES:
  KEY:
    AD42F7787B035B7580000EF93BE20BAD
TOKEN:
  KEY:
    foh3wi2ooghiCh5
    foh3wi2ooghiCh5
file:
  path: E:/upload

 screen-api/src/main/resources/application-qa.yml

@@ -140,4 +140,4 @@
    foh3wi2ooghiCh5

file:
  path: E:\upload
  path: E:/upload