Merge branch 'develop'

kustomization/base/configMap.yaml

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

kustomization/base/deployment.yaml

@@ -39,6 +39,11 @@ spec:
                 configMapKeyRef:
                   name: pms-map
                   key: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+            - name: SW_AGENT_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: pms-map
+                  key: SW_AGENT_NAME
       volumes:
         - name: log-of-app
           hostPath:

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: a867fba96ec08a2bc2dc53d1ed1fb8c77e6fc287
+  newTag: ccc7c809c80517b9c27c53b03fafcb3feefd04b6

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

@@ -144,10 +144,20 @@ public class UploadController {
         ossClient.shutdown();
       }
     }
+    deleteFile(file);
     return ResultBody.success(location);
   }
 
 
+  
+  private void deleteFile(File... files) {
+    for (File file : files) {
+      if (file.exists()) {
+        file.delete();
+      }
+    }
+  }
+
   @ApiOperation(value = "V1.0.1-上传多个文件到阿里云oss")
   @ApiImplicitParams({
     @ApiImplicitParam(

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

@@ -38,6 +38,7 @@ public class ProductServiceImpl implements ProductSkuService {
       return ResultBody.error(ResultEnum.GOODS_CATEGORY_NAME_EXIST_ERROR);
     }
     ProductSkuDO productSkuDO = new ProductSkuDO(param);
+    productSkuDO.setCustomize(0);
     // 新增产品sku
     int status = productDao.insertProductSku(productSkuDO);
     if (status <= 0) {