Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/pms into develop

kustomization/base/configMap.yaml

@@ -5,5 +5,5 @@ metadata:
   namespace: default
 data:
   SPRING_PROFILES_ACTIVE: default
-  SW_AGENT_COLLECTOR_BACKEND_SERVICES: "default-oap.default:11800"
+  SW_AGENT_COLLECTOR_BACKEND_SERVICES: "default-oap.skywalking-swck-system:11800"
   SW_AGENT_NAME: pms

kustomization/base/deployment.yaml

@@ -22,6 +22,9 @@ spec:
           volumeMounts:
             - name: log-of-app
               mountPath: /var/log/app
+            - name: localtime
+              mountPath: /etc/localtime
+              readOnly: true
           resources:
             limits:
               memory: 1024Mi
@@ -47,4 +50,7 @@ spec:
       volumes:
         - name: log-of-app
           hostPath:
-            path: /var/log/app
+            path: /var/log/app
\ No newline at end of file
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 81962caa60ca37cac7193d1b082e03ec12050775
+  newTag: 194916f4e3221cae1ca3a244509e5a2311dca5db

src/main/java/com/mmc/pms/config/GlobalFormDateConvert.java

@@ -33,7 +33,6 @@ public class GlobalFormDateConvert implements Converter<String, Date> {
 
 	// 自定义函数，将字符串转Date 参1：传入的日期字符串 参2：格式参数
 	public Date parseDate(String source, String format) {
-		System.out.println("parseDate转换日期");
 		Date date = null;
 		try {
 			// 日期格式转换器
@@ -48,8 +47,6 @@ public class GlobalFormDateConvert implements Converter<String, Date> {
 	// convert转换方法 ，s是将会传递过来的日期的字符串
 	@Override
 	public Date convert(String source) {
-
-		System.out.println("convert日期格式转换器");
 		if (StringUtils.isEmpty(source)) {
 			return null;
 		}

src/main/java/com/mmc/pms/controller/PartUploadController.java

 package com.mmc.pms.controller;
 
+import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.*;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.json.JsonUtil;
@@ -9,12 +11,15 @@ import com.mmc.pms.redis.RedisConstant;
 import com.mmc.pms.util.OssConstant;
 import com.mmc.pms.util.PartUploadInfo;
 import com.mmc.pms.util.TDateUtil;
+import com.mmc.pms.util.XmlUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
@@ -23,6 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * @Author small @Date 2023/5/23 13:46 @Version 1.0
@@ -30,10 +36,12 @@ import java.util.List;
 @Api(tags = {"分片上传"})
 @RestController
 @RequestMapping("/partupload")
+@Slf4j
 public class PartUploadController {
 
   @Autowired private StringRedisTemplate stringRedisTemplate;
 
+  @ApiIgnore
   @ApiOperation(value = "初始化分片上传")
   @GetMapping("/initPartUpload")
   public ResultBody initPartUpload(@RequestParam String fileName, HttpServletRequest httpRequest) {
@@ -74,7 +82,7 @@ public class PartUploadController {
         .set(RedisConstant.createPartUploadKey(uploadId), JsonUtil.parseObjToJson(pinfo));
     return ResultBody.success(uploadId);
   }
-
+  @ApiIgnore
   @ApiOperation(value = "进行片段上传")
   @PostMapping("/partUpload")
   public ResultBody partUpload(
@@ -133,13 +141,12 @@ public class PartUploadController {
 
     // 完成上传。
     CompleteMultipartUploadResult completeMultipartUploadResult =
-        ossClient.completeMultipartUpload(completeMultipartUploadRequest);
-    System.out.println(completeMultipartUploadResult.getETag());
-    // 关闭OSSClient。
+        ossClient.completeMultipartUpload(completeMultipartUploadRequest);// 关闭OSSClient。
     ossClient.shutdown();
     return ResultBody.success();
   }
 
+  @ApiIgnore
   @ApiOperation(value = "上传到阿里云oss")
   @PostMapping("/oss")
   public ResultBody oss(
@@ -219,9 +226,98 @@ public class PartUploadController {
     // 完成上传。
     CompleteMultipartUploadResult completeMultipartUploadResult =
         ossClient.completeMultipartUpload(completeMultipartUploadRequest);
-    System.out.println(completeMultipartUploadResult.getETag());
     // 关闭OSSClient。
     ossClient.shutdown();
     return ResultBody.success();
   }
+
+  @PostMapping("/multipartUpload")
+  public ResultBody multipartUpload(
+          @RequestParam("multipartUpload") MultipartFile uploadFile, HttpServletRequest request) throws IOException {
+    OSS ossClient =
+            new OSSClientBuilder()
+                    .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
+    File file = XmlUtil.ossUpload(uploadFile);
+    String oldName = uploadFile.getOriginalFilename();
+    String newName =
+            "file/"
+                    + UUID.randomUUID().toString()
+                    + oldName.substring(oldName.lastIndexOf("."), oldName.length());
+    String location=null;
+    try {
+      // 创建InitiateMultipartUploadRequest对象。
+      InitiateMultipartUploadRequest requests= new InitiateMultipartUploadRequest(OssConstant.BUCKET, newName);
+      // 初始化分片。
+      InitiateMultipartUploadResult upresult = ossClient.initiateMultipartUpload(requests);
+      // 返回uploadId，它是分片上传事件的唯一标识。您可以根据该uploadId发起相关的操作，例如取消分片上传、查询分片上传等。
+      String uploadId = upresult.getUploadId();
+      List<PartETag> partETags =  new ArrayList<PartETag>();
+      final long partSize = 1 * 1024 * 1024L;   //1 MB。
+      // 根据上传的数据大小计算分片数。以本地文件为例，说明如何通过File.length()获取上传数据的大小。
+      final File sampleFile = new File(file.toString());
+      long fileLength = sampleFile.length();
+      int partCount = (int) (fileLength / partSize);
+      if (fileLength % partSize != 0) {
+        partCount++;
+      }
+      // 遍历分片上传。
+      for (int i = 0; i < partCount; i++) {
+        long startPos = i * partSize;
+        long curPartSize = (i + 1 == partCount) ? (fileLength - startPos) : partSize;
+        UploadPartRequest uploadPartRequest = new UploadPartRequest();
+        uploadPartRequest.setBucketName(OssConstant.BUCKET);
+        uploadPartRequest.setKey(newName);
+        uploadPartRequest.setUploadId(uploadId);
+        // 设置上传的分片流。
+        // 以本地文件为例说明如何创建FIleInputstream，并通过InputStream.skip()方法跳过指定数据。
+        InputStream instream = new FileInputStream(sampleFile);
+        instream.skip(startPos);
+        uploadPartRequest.setInputStream(instream);
+        // 设置分片大小。除了最后一个分片没有大小限制，其他的分片最小为100 KB。
+        uploadPartRequest.setPartSize(curPartSize);
+        // 设置分片号。每一个上传的分片都有一个分片号，取值范围是1~10000，如果超出此范围，OSS将返回InvalidArgument错误码。
+        uploadPartRequest.setPartNumber( i + 1);
+        // 每个分片不需要按顺序上传，甚至可以在不同客户端上传，OSS会按照分片号排序组成完整的文件。
+        UploadPartResult uploadPartResult = ossClient.uploadPart(uploadPartRequest);
+        // 每次上传分片之后，OSS的返回结果包含PartETag。PartETag将被保存在partETags中。
+        partETags.add(uploadPartResult.getPartETag());
+      }
+        CompleteMultipartUploadRequest completeMultipartUploadRequest =
+              new CompleteMultipartUploadRequest(OssConstant.BUCKET, newName, uploadId, partETags);
+      // 完成分片上传。
+      CompleteMultipartUploadResult completeMultipartUploadResult = ossClient.completeMultipartUpload(completeMultipartUploadRequest);
+      log.info(completeMultipartUploadResult.getETag());
+      location = completeMultipartUploadResult.getLocation();
+    } catch (OSSException oe) {
+      log.info("Caught an OSSException, which means your request made it to OSS, "
+              + "but was rejected with an error response for some reason.");
+      log.info("Error Message:" + oe.getErrorMessage());
+      log.info("Error Code:" + oe.getErrorCode());
+      log.info("Request ID:" + oe.getRequestId());
+      log.info("Host ID:" + oe.getHostId());
+    } catch (ClientException ce) {
+      log.info("Caught an ClientException, which means the client encountered "
+              + "a serious internal problem while trying to communicate with OSS, "
+              + "such as not being able to access the network.");
+      log.info("Error Message:" + ce.getMessage());
+    } finally {
+      if (ossClient != null) {
+        ossClient.shutdown();
+      }
+    }
+    deleteFile(file);
+    return ResultBody.success(location);
+  }
+
+  private void deleteFile(File... files) {
+    for (File file : files) {
+      if (file.exists()) {
+        file.delete();
+      }
+    }
+  }
+
+
+
+
 }

src/main/java/com/mmc/pms/controller/UploadController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
@@ -36,6 +37,7 @@ import java.util.*;
 @Api(tags = {"上传文件"})
 @RestController
 @RequestMapping("/upload")
+@Slf4j
 public class UploadController {
   SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd/");
 
@@ -124,20 +126,11 @@ public class UploadController {
       // 断点续传上传。
       UploadFileResult uploadFileResult = ossClient.uploadFile(uploadFileRequest);
       location = uploadFileResult.getMultipartUploadResult().getLocation();
-      System.out.println(uploadFileResult);
 
     } catch (OSSException oe) {
-      System.out.println("Caught an OSSException, which means your request made it to OSS, "
-              + "but was rejected with an error response for some reason.");
-      System.out.println("Error Message:" + oe.getErrorMessage());
-      System.out.println("Error Code:" + oe.getErrorCode());
-      System.out.println("Request ID:" + oe.getRequestId());
-      System.out.println("Host ID:" + oe.getHostId());
+
     } catch (Throwable ce) {
-      System.out.println("Caught an ClientException, which means the client encountered "
-              + "a serious internal problem while trying to communicate with OSS, "
-              + "such as not being able to access the network.");
-      System.out.println("Error Message:" + ce.getMessage());
+
     } finally {
       // 关闭OSSClient。
       if (ossClient != null) {
@@ -183,7 +176,7 @@ public class UploadController {
             .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
     List list = new LinkedList();
     if (uploadFile != null && uploadFile.length > 0) {
-      System.out.println("osses文件数量" + uploadFile.length);
+      log.info("osses文件数量" + uploadFile.length);
       for (int i = 0; i < uploadFile.length; i++) {
         MultipartFile file = uploadFile[i];
         InputStream inputStream = null;
@@ -245,7 +238,7 @@ public class UploadController {
                 clientBuilderConfiguration);
     List list = new LinkedList();
     if (uploadFile != null && uploadFile.length > 0) {
-      System.out.println("osses文件数量" + uploadFile.length);
+      log.info("osses文件数量" + uploadFile.length);
       for (int i = 0; i < uploadFile.length; i++) {
         MultipartFile file = uploadFile[i];
         InputStream inputStream = null;
@@ -266,7 +259,7 @@ public class UploadController {
                   + UUID.randomUUID().toString()
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
-          System.out.println("视频名称：" + newName);
+          log.info("视频名称：" + newName);
           list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
         }
       }
@@ -309,7 +302,7 @@ public class UploadController {
                 clientBuilderConfiguration);
     Map map = new HashMap();
     if (uploadFile != null && uploadFile.length > 0) {
-      System.out.println("osses文件数量" + uploadFile.length);
+     log.info("osses文件数量" + uploadFile.length);
       for (int i = 0; i < uploadFile.length; i++) {
         MultipartFile file = uploadFile[i];
         InputStream inputStream = null;
@@ -330,7 +323,7 @@ public class UploadController {
                   + UUID.randomUUID().toString()
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
-          System.out.println("视频名称：" + newName);
+          log.info("视频名称：" + newName);
           map.put(
               "filePath",
               "https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
@@ -369,7 +362,7 @@ public class UploadController {
             .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
     List list = new LinkedList();
     if (uploadFile != null && uploadFile.length > 0) {
-      System.out.println("osses文件数量" + uploadFile.length);
+      log.info("osses文件数量" + uploadFile.length);
       for (int i = 0; i < uploadFile.length; i++) {
         MultipartFile file = uploadFile[i];
         InputStream inputStream = null;
@@ -391,7 +384,7 @@ public class UploadController {
                   + UUID.randomUUID().toString()
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
-          System.out.println("图片名称：" + newName);
+          log.info("图片名称：" + newName);
           list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
         }
       }
@@ -447,7 +440,7 @@ public class UploadController {
                 + UUID.randomUUID().toString()
                 + oldName.substring(oldName.lastIndexOf("."), oldName.length());
         ossClient.putObject(OssConstant.BUCKET, newName, bis);
-        System.out.println("图片名称：" + newName);
+        log.info("图片名称：" + newName);
         list.add("https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
       }
     }
@@ -480,7 +473,7 @@ public class UploadController {
             .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
     Map map = new HashMap();
     if (uploadFile != null && uploadFile.length > 0) {
-      System.out.println("osses文件数量" + uploadFile.length);
+      log.info("osses文件数量" + uploadFile.length);
       for (int i = 0; i < uploadFile.length; i++) {
         MultipartFile file = uploadFile[i];
         InputStream inputStream = null;
@@ -502,7 +495,7 @@ public class UploadController {
                   + UUID.randomUUID().toString()
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
-          System.out.println("图片名称：" + newName);
+          log.info("图片名称：" + newName);
           map.put(
               "filePath",
               "https://" + OssConstant.BUCKET + '.' + OssConstant.ENDPOINT + "/" + newName);
@@ -554,7 +547,6 @@ public class UploadController {
             .build(OssConstant.ENDPOINT, OssConstant.ACCESSKEYID, OssConstant.ACCESSKEYSECRET);
     Map map = new HashMap();
     if (uploadFile != null && uploadFile.length > 0) {
-      System.out.println("osses文件数量" + uploadFile.length);
       for (int i = 0; i < uploadFile.length; i++) {
         MultipartFile file = uploadFile[i];
         InputStream inputStream = null;
@@ -576,7 +568,6 @@ public class UploadController {
                   + UUID.randomUUID().toString()
                   + oldName.substring(oldName.lastIndexOf("."), oldName.length());
           ossClient.putObject(OssConstant.BUCKET, newName, bis);
-          System.out.println("文档名称：" + newName);
 
           map.put(
               "filePath",

src/main/java/com/mmc/pms/json/JsonUtil.java

@@ -13,12 +13,6 @@ import java.util.List;
  */
 public class JsonUtil {
 
-  public static void main(String[] args) {
-    String array = "[1,24,23]";
-    List<Integer> list = JSONArray.parseArray(array, Integer.class);
-    System.out.println(list.get(2));
-  }
-
   /**
    * 把Java对象转换成json字符串
    *

src/main/java/com/mmc/pms/service/Impl/CategoriesServiceImpl.java

@@ -22,6 +22,7 @@ import com.mmc.pms.model.sale.vo.QueryClassifyVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.BackstageTaskService;
 import com.mmc.pms.service.CategoriesService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
  * @createDate 2023-05-24 10:29:28
  */
 @Service
+@Slf4j
 public class CategoriesServiceImpl implements CategoriesService {
   @Autowired private CategoriesDao categoriesDao;
   @Resource private GoodsInfoDao goodsInfoDao;
@@ -252,7 +254,7 @@ public class CategoriesServiceImpl implements CategoriesService {
               .collect(Collectors.toList());
       Map<Integer, List<CategoriesInfoListDTO>> categoryMap = getCategoryMap(allCategoryDTOList);
       addSubCategories(allCategoryDTOList, categoryMap);
-      System.out.println("Res: " + JSONObject.toJSON(allCategoryDTOList));
+      log.info("Res: " + JSONObject.toJSON(allCategoryDTOList));
       return allCategoryDTOList;
     }
     return null;