Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-03-08 32c350b8aca021b84125f1334f7a183a2defcbfd

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java

@@ -27,7 +27,7 @@
        // 上传文件流
        try {
            // 获取文件的名称
            String fileName = file.getOriginalFilename();
            String fileName = "sczf/" + file.getOriginalFilename();
            ObjectMetadata objectMetadata = new ObjectMetadata();
            objectMetadata.setContentType(getcontentType(fileName.substring(fileName.lastIndexOf("."))));
            // 调用oss的方法实现长传
@@ -76,7 +76,7 @@
        // 上传文件流
        try {
            // 获取文件的名称
            String fileName = String.valueOf(UUID.randomUUID());
            String fileName = "sczf/" + String.valueOf(UUID.randomUUID());
            ObjectMetadata objectMetadata = new ObjectMetadata();
            objectMetadata.setContentType(getcontentType(ext));
            // 调用oss的方法实现长传

 ycl-smoke/src/main/resources/application-pro.yml

@@ -24,8 +24,8 @@
spring:
  redis:
    database: 0
    host: 10.53.157.24
    port: 6379
    host: 127.0.0.1
    port: 6380
    password: ycl2018
    jedis:
      pool: