Merge branch 'master' of https://git.zyuas.com/DJI/shangyun into dev/jkec

Backend/sample/src/main/java/com/dji/sample/configuration/mvc/GlobalMVCConfigurer.java

@@ -32,6 +32,7 @@ public class GlobalMVCConfigurer implements WebMvcConfigurer {
         excludePaths.add("/" + managePrefix + manageVersion + "/login");
         excludePaths.add("/" + managePrefix + manageVersion + "/getToken");
         excludePaths.add("/" + managePrefix + manageVersion + "/token/refresh");
+        excludePaths.add("/media"  + manageVersion + "/files/**/file/**");
         excludePaths.add("/swagger-ui.html");
         excludePaths.add("/swagger-ui/**");
         excludePaths.add("/v3/**");

Web/src/pages/page-web/projects/media/detail/components/FileInfo.vue

@@ -13,7 +13,6 @@
         </div>
         <div class="fileInfo-detail-info">
           <CloseOutlined class="fileInfo-detail-info-close" @click="onClose" />
-          <ShareAltOutlined class="fileInfo-detail-info-share" @click="onClickShare" />
           <div class="fileInfo-detail-info-title">
             详细信息
           </div>
@@ -114,6 +113,7 @@
         <a-tooltip placement="bottom" title="下载">
           <DownloadOutlined style="font-size: 20px;margin-right: 20px;" @click="onClickDownload" />
         </a-tooltip>
+
         <div v-if="[1, 3].includes(state.info.media_type)">
           <a-tooltip placement="bottom" title="在地图上加载" v-if="!state.info.element_id">
             <AimOutlined style="font-size: 20px;margin-right: 20px;" @click="onClickCreateMapElement" />
@@ -122,6 +122,9 @@
             <AimOutlined style="font-size: 20px;margin-right: 20px;" @click="onClickDeleteMapElement" />
           </a-tooltip>
         </div>
+        <a-tooltip placement="bottom" title="分享">
+          <ShareAltOutlined style="font-size: 20px;margin-right: 20px;" @click="onClickShare" />
+        </a-tooltip>
       </div>
       <div class="fileInfo-previewList">
         <div class="fileInfo-previewList-button" @click="onClickScroll('LEFT')" @mousedown.prevent>