测试bug修复-0831-oss关闭

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/util/OssUploadUtil.java

@@ -109,6 +109,8 @@ public class OssUploadUtil {
                     att.setDeleteStatus(del ? SUCCESS : FAIL);
                 }
             }
+            // 关闭OSSClient。
+            ossClient.shutdown();
         } catch (Exception e) {
             if (att != null) {
                 att.setOssFailMsg(e.getMessage());

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/util/RotateTask.java

@@ -162,6 +162,8 @@ public class RotateTask implements Runnable {
                         if (ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1) {
                             fileName = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), student.getAreaCode(), paper.getExamNumber(), student.getId());
                         }
+                        long s0 = System.currentTimeMillis();
+                        LOGGER.info("===============OSS-生成缩略图、裁切图开始：原文件名{}================", fileName);
 
                         //阿里云oss图片旋转
                         StringJoiner thumbSj = new StringJoiner("/").add(imageServerConfig.getDir()).add(systemConfig.getThumbDir().replace("\\", "/")).add(String.valueOf(student.getWorkId())).add(paper.getSubject().name()).add(student.getAreaCode()).add(fileName + ".jpg");
@@ -173,17 +175,28 @@ public class RotateTask implements Runnable {
                                 + File.separator + paper.getAreaCode() + File.separator + fileName + ".jpg";
                         imagePath = systemConfig.getImageDir() + File.separator + paper.getWorkId() + File.separator + paper.getSubject().toString()
                                 + File.separator + paper.getAreaCode() + File.separator + fileName + ".jpg";
+                        long s1 = System.currentTimeMillis();
+                        LOGGER.info("OSS-生成缩略图、裁切图：原文件名{}，从OSS下载开始", fileName);
                         File thumbFile = ossUtil.ossDownload(thumbSj.toString(), thumbPath);
                         File imageFile = ossUtil.ossDownload(imageSj.toString(), imagePath);
+                        long s2 = System.currentTimeMillis();
+                        LOGGER.info("OSS-生成缩略图、裁切图：原文件名{}，从OSS下载结束，耗时：{}秒，开始旋转", fileName, (s2 - s1) / 1000);
                         ImageCompression.rotate(thumbFile, new File(thumbPath), degree);
                         ImageCompression.rotate(imageFile, new File(imagePath), degree);
+                        long s3 = System.currentTimeMillis();
+                        LOGGER.info("OSS-生成缩略图、裁切图：原文件名{}，旋转结束，耗时：{}秒，原文件重命名开始", fileName, (s3 - s2) / 1000);
                         FileInputStream in = new FileInputStream(new File(imagePath));
                         sliceMD5 = DigestUtils.md5Hex(in);
                         in.close();
                         ossUtil.ossCopy(thumbSj.toString(), thumbNewSj.toString());
                         ossUtil.ossCopy(imageSj.toString(), imageNewSj.toString());
+                        long s4 = System.currentTimeMillis();
+                        LOGGER.info("OSS-生成缩略图、裁切图：原文件名{}，原文件重命名结束，耗时：{}秒，上传旋转图片开始", fileName, (s4 - s3) / 1000);
                         ossUtil.ossUpload(thumbSj.toString(), new FileInputStream(thumbFile));
                         ossUtil.ossUpload(imageSj.toString(), new FileInputStream(imageFile));
+                        long s5 = System.currentTimeMillis();
+                        LOGGER.info("OSS-生成缩略图、裁切图：原文件名{}，上传旋转图片结束，耗时：{}秒", fileName, (s5 - s4) / 1000);
+                        LOGGER.info("===============OSS-生成缩略图、裁切图结束：原文件名{}，总耗时：{}秒================", fileName, (s5 - s0) / 1000);
                         thumbFile.delete();
                         imageFile.delete();
                     } else {

stmms-ms-commons/src/main/java/cn/com/qmth/stmms/ms/commons/utils/OssUtil.java

@@ -37,7 +37,7 @@ public class OssUtil {
      * @param inputStream
      */
     public void ossUpload(String dirName, InputStream inputStream) {
-        LOGGER.info("ossUpload is come in");
+//        LOGGER.info("ossUpload is come in");
         // Endpoint以杭州为例，其它Region请按实际情况填写。
         String endpoint = aliYunOssConfig.getEndpoint();
         // 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
@@ -51,6 +51,8 @@ public class OssUtil {
         // 上传内容到指定的存储空间（bucketName）并保存为指定的文件名称（objectName）。
         PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectName, inputStream);
         PutObjectResult por = ossClient.putObject(putObjectRequest);
+        // 关闭OSSClient。
+        ossClient.shutdown();
         LOGGER.info("objectName:{},requestid:{}", objectName, por.getRequestId());
     }