Merge pull request 'fix log info format' (#135) from dev into test

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/135

xueyi-modules/xueyi-file/src/main/java/com/xueyi/file/controller/SysFileController.java

@@ -58,7 +58,7 @@ public class SysFileController {
     @PostMapping("/inner/upload")
     public R<SysFile> uploadInner(MultipartFile file) {
         try {
-            log.info("文件上传开始：" + file.getName());
+            log.info("文件上传开始：{}" , file.getName());
             // 上传并返回访问地址
             String url = sysFileService.uploadFile(file);
             SysFile sysFile = new SysFile();
@@ -78,7 +78,7 @@ public class SysFileController {
     @PostMapping("/inner/upload-temp")
     public R<SysFile> uploadTempInner(MultipartFile file) {
         try {
-            log.info("文件上传开始：" + file.getName());
+            log.info("文件上传开始：{}" , file.getName());
             // 上传并返回访问地址
             String url = sysFileService.uploadTempFile(file);
             SysFile sysFile = new SysFile();
@@ -102,18 +102,18 @@ public class SysFileController {
     public R<List<SysFile>> uploadPdfInner(MultipartFile file) {
         try {
             Long startTs =  System.currentTimeMillis();
-            log.info("文件上传开始：" + file.getName()+"; start ts:"+startTs);
+            log.info("文件上传开始：{}; start ts:{}", file.getName(), startTs);
             // pdf文件转成图片集合
             List<File> fileList = PdfToImageUtil.pdfToTransformationList(file);
             Long  pdfTs =  System.currentTimeMillis();
-            log.info("PDF转换图片完成， 用时："+(pdfTs-startTs)+"ms");
+            log.info("PDF转换图片完成， 用时：{} ms",(pdfTs-startTs));
             List<SysFile> results = new ArrayList<>();
             int num = 1;
             log.info("开始上传图片。。。");
             // 循环上传并返回日志集合
             for (File f : fileList) {
                 //将file的文件名重命名为file文件名+两位数的num
-                log.info("上传第"+num+"张图片开始。。。");
+                log.info("上传第 {} 张图片开始。。。",num);
                 String fileName = f.getName();
                 String suffix = fileName.substring(fileName.lastIndexOf("."));
                 String name = fileName.substring(0, fileName.lastIndexOf("."));
@@ -127,10 +127,10 @@ public class SysFileController {
                 sysFile.setNick(sysFile.getName());
                 remoteFileManageService.saveFileLog(sysFile, SecurityConstants.INNER);
                 results.add(sysFile);
-                log.info("上传第"+(num-1)+"张图片完成。。。");
+                log.info("上传第 {} 张图片完成。。。",(num-1));
             };
             long endTs = System.currentTimeMillis();
-            log.info("上传图片结束。。。，用时："+(endTs-pdfTs)+"ms");
+            log.info("上传图片结束。。。，用时：{} ms", (endTs-pdfTs));
 
             return R.ok(results);
         } catch (Exception e) {

xueyi-modules/xueyi-file/src/main/java/com/xueyi/file/service/MinioSysFileServiceImpl.java

@@ -47,7 +47,7 @@ public class MinioSysFileServiceImpl implements ISysFileService {
         String fileName = FileUploadUtils.extractFilename(file);
 
         //fileName = URLEncoder.encode(fileName, "UTF-8");
-        log.info("Minio filename:" + fileName);
+        log.info("Minio filename: {}" , fileName);
         PutObjectArgs args = PutObjectArgs.builder()
                 .bucket(minioConfig.getBucketName())
                 .object(fileName)
@@ -72,8 +72,8 @@ public class MinioSysFileServiceImpl implements ISysFileService {
     public String uploadFile(String fileName, File file) throws Exception {
         fileName = FileUploadUtils.extractFilename(fileName);
         InputStream inputStream = FileUtils.openInputStream(file);
-        log.info("file original filename = " + fileName);
-        log.info("file size = " + file.length());
+        log.info("file original filename = {}" , fileName);
+        log.info("file size = {} " , file.length());
 
         // 使用IOUtils.toByteArray()方法确保正确地读取输入流中的数据
         byte[] fileBytes = IOUtils.toByteArray(inputStream);
@@ -81,7 +81,7 @@ public class MinioSysFileServiceImpl implements ISysFileService {
         // 上传文件到MinIO
         String minioFileName = uploadFileToMinIO(fileName, fileBytes);
 
-        log.info("MinIO 文件上传成功，Minio 文件名：" + minioFileName);
+        log.info("MinIO 文件上传成功，Minio 文件名：{}" , minioFileName);
 
         // 获取fileName的最后一个'/'的位置的字符串，并用URLEncoder进行UTF-8编码后，再拼接到fileName中
         String splitStr = fileName.substring(fileName.lastIndexOf("/") + 1);
@@ -95,8 +95,8 @@ public class MinioSysFileServiceImpl implements ISysFileService {
     public String uploadTempFile(String fileName, File file) throws Exception {
         fileName = FileUploadUtils.extractFilename(fileName);
         InputStream inputStream = FileUtils.openInputStream(file);
-        log.info("file original filename = " + fileName);
-        log.info("file size = " + file.length());
+        log.info("file original filename = {} " , fileName);
+        log.info("file size = {}" , file.length());
 
         // 使用IOUtils.toByteArray()方法确保正确地读取输入流中的数据
         byte[] fileBytes = IOUtils.toByteArray(inputStream);
@@ -104,7 +104,7 @@ public class MinioSysFileServiceImpl implements ISysFileService {
         // 上传文件到MinIO
         String minioFileName = uploadFileToMinIO(fileName, fileBytes);
 
-        log.info("MinIO Temp文件上传成功，Minio 文件名：" + minioFileName);
+        log.info("MinIO Temp文件上传成功，Minio 文件名：{}", minioFileName);
 
         // 获取fileName的最后一个'/'的位置的字符串，并用URLEncoder进行UTF-8编码后，再拼接到fileName中
         String splitStr = fileName.substring(fileName.lastIndexOf("/") + 1);
@@ -140,7 +140,7 @@ public class MinioSysFileServiceImpl implements ISysFileService {
                         .build()
         );
 
-        log.info("文件上传到MinIO成功：" + fileName);
+        log.info("文件上传到MinIO成功：{}", fileName);
         String splitStr = fileName.substring(fileName.lastIndexOf("/") + 1);
         splitStr = URLEncoder.encode(splitStr, "UTF-8");
         fileName = fileName.substring(0, fileName.lastIndexOf("/") + 1) + splitStr;

xueyi-modules/xueyi-file/src/main/java/com/xueyi/file/utils/PdfToImageUtil.java

@@ -50,7 +50,7 @@ public class PdfToImageUtil {
         String fileName = file.getOriginalFilename();
         if(null == fileName) return;
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-        log.info("文件名称：" + fileName + ",文件后缀：" + suffix);
+        log.info("文件名称：{},文件后缀：{}", fileName, suffix);
         if(!SUPPORT_FILE.equals(suffix)) return;
         isImage = false;
         File imageFile = generateFile(file);

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/pass/service/impl/DmRecognizedRecordsServiceImpl.java

@@ -49,7 +49,7 @@ public class DmRecognizedRecordsServiceImpl extends BaseServiceImpl<DmRecognized
     @TenantIgnore(tenantLine = true)
     public void syncToRedis(){
         Long count = recognizedRecordsMapper.selectCount(new QueryWrapper<>());
-        log.info("同步redis mysql识别人数："+count);
+        log.info("同步redis mysql识别人数：{}", count);
         redisTemplate.opsForValue().set("dashboard:recognizedPersonCount",count);
     }