Browse Source

no message

FengChaoYu 7 months ago
parent
commit
eb1fd9e6be

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/CompanyCaAuthLogic.java

@@ -187,7 +187,7 @@ public class CompanyCaAuthLogic {
         CompanyInfo company = new CompanyInfo();
         company.setCompanyName(companyCaAuth.getCompanyName());
         company.setCreditNo(companyCaAuth.getTaxNo());
-        company.setCreditImagePath(ossUtil.getUrlWw(ossUtil.replaceLongKeyUrl(companyCaAuth.getBusinessLicenseUrl())));
+//        company.setCreditImagePath(ossUtil.getUrlWw(ossUtil.replaceLongKeyUrl(companyCaAuth.getBusinessLicenseUrl())));
 
         LegalInfo legal = new LegalInfo();
         legal.setLegalName(companyCaAuth.getLegalName());

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/ContractTemplateLogic.java

@@ -84,7 +84,7 @@ public class ContractTemplateLogic {
         // 检查二级网点的主合同有没有
         this.checkMainDate(contractTemplate);
 
-        String urlWw = ossUtil.getUrlWw(ossUtil.replaceLongKeyUrl(contractTemplate.getContractTemplatePdf()));
+        String urlWw = contractTemplate.getContractTemplatePdf();
         String templateId = IdWorker.getIdStr();
 
         Auth4FDDUtil.uploadTemplate(templateId, null, urlWw);
@@ -110,7 +110,7 @@ public class ContractTemplateLogic {
         this.checkMainDate(contractTemplate);
         ContractTemplate byId = contractTemplateService.getById(contractTemplate.getContractTemplateId());
         if (!byId.getContractTemplatePdf().equals(contractTemplate.getContractTemplatePdf())) {
-            String urlWw = ossUtil.getUrlWw(ossUtil.replaceLongKeyUrl(contractTemplate.getContractTemplatePdf()));
+            String urlWw = contractTemplate.getContractTemplatePdf();
             String templateId = IdWorker.getIdStr();
             Auth4FDDUtil.uploadTemplate(templateId, null, urlWw);
             byId.setFadadaTemplateId(templateId);

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -223,7 +223,7 @@ public class WebsitContractSignLogic {
                 Auth4FDDUtil.generateContract(websitFile.getFadadaTemplateId(), generateContractId,
                         websitFile.getContractName(), null, null, fddParams);
             } else {
-                String urlWw = ossUtil.getUrlWw(ossUtil.replaceLongKeyUrl(websitFile.getContractTemplatePdf()));
+                String urlWw = websitFile.getContractTemplatePdf();
                 Auth4FDDUtil.uploadContract(generateContractId, websitFile.getContractName(),
                         null, urlWw);
             }

+ 1 - 2
mall-server-api/src/main/java/com/gree/mall/manager/utils/oss/OSSUtil.java

@@ -222,8 +222,7 @@ public class OSSUtil {
     }
 
     public String replaceLongKeyUrl(String longKey) {
-        String replace1 = longKey.replace("https://", "");
-        String replace2 = replace1.replace(OSS_BUCKET_NAME + ".", "");
+        String replace2 = longKey.replace("https://" + OSS_BUCKET_NAME + ".", "");
         return replace2.replace(OSS_ENDPOINT_WW, "");
     }
 }