Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 302d51ec3c223fd32c746d6bc163a840225b6f46

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java

@@ -79,6 +79,9 @@
            fileExtension = ".mp4";
        }

        if(originName.toLowerCase().endsWith(".mp3")){
            fileExtension = ".mp3";
        }

        String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
        File file1 = new File(fileName);