Explorar o código

加入时间后缀问题

java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
7fbd9922fe

+ 2 - 4
Api/src/main/java/com/java110/api/listener/machineTranslate/MachineQueryUserInfoListener.java

@@ -247,10 +247,8 @@ public class MachineQueryUserInfoListener extends BaseMachineListener {
         dataObj.put("groupid", communityId);
         dataObj.put("groupid", communityId);
         dataObj.put("group", communityDtos.get(0).getName());
         dataObj.put("group", communityDtos.get(0).getName());
         dataObj.put("name", ownerDto.getName());
         dataObj.put("name", ownerDto.getName());
-        dataObj.put("faceBase64", "data:image/jpeg;base64," + fileDtos.get(0).getContext()
-                .replace("data:image/webp;base64,", "")
-                .replace("data:image/png;base64,", "")
-                .replace("data:image/jpeg;base64,", ""));
+        String tmpImg = fileDtos.get(0).getContext();
+        dataObj.put("faceBase64", "data:image/jpeg;base64," + tmpImg.substring(tmpImg.indexOf("base64,") + 7));
         dataObj.put("idNumber", ownerDto.getIdCard());
         dataObj.put("idNumber", ownerDto.getIdCard());
         dataObj.put("startTime", ownerDto.getCreateTime().getTime());
         dataObj.put("startTime", ownerDto.getCreateTime().getTime());
         try {
         try {

+ 4 - 2
CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java

@@ -58,9 +58,10 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
         List<FileDto> fileDtos = new ArrayList<>();
         List<FileDto> fileDtos = new ArrayList<>();
         String fileName = fileDto.getFileSaveName();
         String fileName = fileDto.getFileSaveName();
         String ftpPath = java110Properties.getFtpPath();
         String ftpPath = java110Properties.getFtpPath();
+        String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         if (fileName.contains("/")) {
         if (fileName.contains("/")) {
-            ftpPath += fileName.substring(0, fileName.lastIndexOf("/")+1);
-            fileName = fileName.substring(fileName.lastIndexOf("/")+1, fileName.length());
+            ftpPath += fileName.substring(0, fileName.lastIndexOf("/") + 1);
+            fileName = fileName.substring(fileName.lastIndexOf("/") + 1, fileName.length());
         }
         }
 //        byte[] fileImg = ftpUploadTemplate.downFileByte(ftpPath, fileName, java110Properties.getFtpServer(),
 //        byte[] fileImg = ftpUploadTemplate.downFileByte(ftpPath, fileName, java110Properties.getFtpServer(),
 //                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
 //                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
@@ -73,6 +74,7 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
                 java110Properties.getFtpUserPassword());
                 java110Properties.getFtpUserPassword());
 
 
         fileDto.setContext(context);
         fileDto.setContext(context);
+        fileDto.setSuffix(suffix);
         fileDtos.add(fileDto);
         fileDtos.add(fileDto);
         return fileDtos;
         return fileDtos;
     }
     }