From 116b4dc7a20c7fc856a2878da593287d2b076ed2 Mon Sep 17 00:00:00 2001
From: WenG <450292408@qq.com>
Date: Sun, 11 Apr 2021 22:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E7=9A=84?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/appversion/update.html     | 2 +-
 login-base/src/main/resources/templates/login.html          | 4 ++--
 .../ink/wgink/module/file/service/impl/FileServiceImpl.java | 6 +++---
 .../src/main/resources/templates/file/list-info.html        | 2 +-
 module-file/src/main/resources/templates/file/show.html     | 4 ++--
 .../resources/templates/department/user/select-user.html    | 4 ++--
 .../src/main/resources/templates/oauth/client/save.html     | 2 +-
 .../src/main/resources/templates/oauth/client/update.html   | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/login-app/src/main/resources/templates/appversion/update.html b/login-app/src/main/resources/templates/appversion/update.html
index 9acbe01f..856bf6ba 100644
--- a/login-app/src/main/resources/templates/appversion/update.html
+++ b/login-app/src/main/resources/templates/appversion/update.html
@@ -66,7 +66,7 @@
     <script id="appFileDownload" type="text/html">
         {{# if(d.appFile != '') { }}
         <span class="layui-btn-group">
-            <a class="layui-btn layui-btn-normal" href="route/file/downloadfile/false/{{d.appFile}}" target="_blank">点击下载此文件</a>
+            <a class="layui-btn layui-btn-normal" href="route/file/download/false/{{d.appFile}}" target="_blank">点击下载此文件</a>
             <a class="layui-btn layui-btn-danger text-danger" href="javascript:void(0);" lay-form-button lay-filter="removeAppFile">删除</a>
         </span>
         {{# } }}
diff --git a/login-base/src/main/resources/templates/login.html b/login-base/src/main/resources/templates/login.html
index 6496f8d1..66ce79d0 100644
--- a/login-base/src/main/resources/templates/login.html
+++ b/login-base/src/main/resources/templates/login.html
@@ -35,7 +35,7 @@
 <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login">
     <div id="layadminUserLoginMain" class="layadmin-user-login-main" style="">
         <div class="layadmin-user-login-box layadmin-user-login-header">
-            <img class="system-logo" th:src="'route/file/downloadfile/true/'+ ${systemLogo}" th:if="${systemLogo ne ''}">
+            <img class="system-logo" th:src="'route/file/download/true/'+ ${systemLogo}" th:if="${systemLogo ne ''}">
             <div th:class="${(systemLogo ne '') ? 'system-logo-title': ''}">
                 <h2 th:text="${systemTitle}" th:style="'font-size:'+ ${systemTitleSize} +'px'"></h2>
                 <p th:text="${systemSubTitle}" th:style="'font-size:'+ ${systemSubTitleSize} +'px'"></p>
@@ -145,7 +145,7 @@
                 var loginBackgroundImageArray = loginBackgroundImages.split(',');
                 for(var i = 0, item = loginBackgroundImageArray[i]; item = loginBackgroundImageArray[i++];) {
                     photos.push({
-                        image: 'route/file/downloadfile/true/'+ item
+                        image: 'route/file/download/true/'+ item
                     })
                 }
             } else {
diff --git a/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java b/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java
index ed7d8b0c..92ebc29d 100644
--- a/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java
+++ b/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java
@@ -450,7 +450,7 @@ public class FileServiceImpl extends DefaultBaseService implements IFileService
             FileDTO fileDTO = uploadSingleForFileDTO(null, image, UploadTypeEnum.IMAGE, params);
             result.put("errno", 0);
             JSONArray fileArray = new JSONArray();
-            fileArray.add(String.format("route/file/downloadfile/true/%s", fileDTO.getFileId()));
+            fileArray.add(String.format("route/file/download/true/%s", fileDTO.getFileId()));
             result.put("data", fileArray);
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
@@ -528,7 +528,7 @@ public class FileServiceImpl extends DefaultBaseService implements IFileService
         List<Map<String, String>> fileList = new ArrayList<>();
         for (FileDTO fileDTO : listFileDTOs) {
             Map<String, String> fileMap = new HashMap<>(0);
-            fileMap.put("url", String.format("%s/route/file/downloadfile/%s/%s.%s", request.getContextPath(), downloadFile, fileDTO.getFileId(), fileDTO.getFileType()));
+            fileMap.put("url", String.format("%s/route/file/download/%s/%s.%s", request.getContextPath(), downloadFile, fileDTO.getFileId(), fileDTO.getFileType()));
             fileList.add(fileMap);
         }
         JSONObject uEditorListResult = new JSONObject();
@@ -565,7 +565,7 @@ public class FileServiceImpl extends DefaultBaseService implements IFileService
         if (fileDTO == null) {
             throw new SystemException("文件上传失败");
         }
-        String fileUrl = String.format("route/file/downloadfile/%s/%s.%s", downloadFile, fileDTO.getFileId(), fileDTO.getFileType());
+        String fileUrl = String.format("route/file/download/%s/%s.%s", downloadFile, fileDTO.getFileId(), fileDTO.getFileType());
         JSONObject fileUploadResult = new JSONObject();
         fileUploadResult.put("state", "SUCCESS");
         fileUploadResult.put("url", fileUrl);
diff --git a/module-file/src/main/resources/templates/file/list-info.html b/module-file/src/main/resources/templates/file/list-info.html
index 745d84a0..77500df4 100644
--- a/module-file/src/main/resources/templates/file/list-info.html
+++ b/module-file/src/main/resources/templates/file/list-info.html
@@ -129,7 +129,7 @@
                                 var icon = '<i class="fa fa-download"></i>';
                                 var result = '';
                                 if(isImageType(row.fileType)) {
-                                    result += '<img src="route/file/downloadfile/true/'+ row.fileId +'" style="display: none;"/>';
+                                    result += '<img src="route/file/download/true/'+ row.fileId +'" style="display: none;"/>';
                                     imageIdArray.push(row.fileId);
                                     icon = '<i class="fa fa-image"></i>';
                                 } else if(row.fileType === 'mp4') {
diff --git a/module-file/src/main/resources/templates/file/show.html b/module-file/src/main/resources/templates/file/show.html
index b8e24219..a626894c 100644
--- a/module-file/src/main/resources/templates/file/show.html
+++ b/module-file/src/main/resources/templates/file/show.html
@@ -11,9 +11,9 @@
 <body>
 <div id="content" class="edit-content" style="padding: 5px;">
     <div class="tile color">
-        <img th:if="${type == 'image'}" th:src="@{'route/file/downloadfile/false/'+ ${fileId}}" alt="加载失败" style="width: 100%;"/>
+        <img th:if="${type == 'image'}" th:src="@{'route/file/download/false/'+ ${fileId}}" alt="加载失败" style="width: 100%;"/>
         <video th:if="${type == 'video'}" controls style="width:100%;">
-            <source th:src="@{'route/file/downloadfile/false/'+ ${fileId}}" type="video/mp4">
+            <source th:src="@{'route/file/download/false/'+ ${fileId}}" type="video/mp4">
             您的浏览器不支持 video 标签。
         </video>
     </div>
diff --git a/service-department/src/main/resources/templates/department/user/select-user.html b/service-department/src/main/resources/templates/department/user/select-user.html
index 9527e285..fa0d0820 100644
--- a/service-department/src/main/resources/templates/department/user/select-user.html
+++ b/service-department/src/main/resources/templates/department/user/select-user.html
@@ -140,7 +140,7 @@
                 if(null == item.userAvatar || '' == item.userAvatar) {
                     avatarDom = '<img class="user-avatar" src="assets/images/profile-photo.jpg"/> '
                 } else {
-                    avatarDom = '<img class="user-avatar" src="route/file/downloadfile/false/'+ item.userAvatar +'"/> ';
+                    avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
                 }
                 userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
             }
@@ -167,7 +167,7 @@
                 if(null == item.userAvatar || '' == item.userAvatar) {
                     avatarDom = '<img class="user-avatar" src="assets/images/profile-photo.jpg"/> '
                 } else {
-                    avatarDom = '<img class="user-avatar" src="route/file/downloadfile/false/'+ item.userAvatar +'"/> ';
+                    avatarDom = '<img class="user-avatar" src="route/file/download/false/'+ item.userAvatar +'"/> ';
                 }
                 userDom += '<a id="user_'+ item.userId +'" href="javascript:void(0);" class="users search-users list-group-item '+ (isUserSelected(item.userId) ? 'user-selected' : '') +'" lay-click-user data-userid="'+ item.userId +'" data-username="'+ item.userName +'">'+ avatarDom + item.userName +' ['+ item.userUsername +']</a>';
             }
diff --git a/service-oauth-client/src/main/resources/templates/oauth/client/save.html b/service-oauth-client/src/main/resources/templates/oauth/client/save.html
index 627ee0c7..b4202f06 100644
--- a/service-oauth-client/src/main/resources/templates/oauth/client/save.html
+++ b/service-oauth-client/src/main/resources/templates/oauth/client/save.html
@@ -138,7 +138,7 @@
                             {{#    for(var i = 0, item = files[i]; item = files[i++];) { }}
                             <div class="upload-image-box">
                                 <span class="upload-image-span">
-                                    <img src="route/file/downloadfile/false/{{item.fileId}}" align="加载失败">
+                                    <img src="route/file/download/false/{{item.fileId}}" align="加载失败">
                                 </span>
                                 <a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="systemIconRemoveFile">
                                     <i class="fa fa-trash-o"></i>
diff --git a/service-oauth-client/src/main/resources/templates/oauth/client/update.html b/service-oauth-client/src/main/resources/templates/oauth/client/update.html
index 0ea6933b..df48ea2b 100644
--- a/service-oauth-client/src/main/resources/templates/oauth/client/update.html
+++ b/service-oauth-client/src/main/resources/templates/oauth/client/update.html
@@ -138,7 +138,7 @@
                             {{#    for(var i = 0, item = files[i]; item = files[i++];) { }}
                             <div class="upload-image-box">
                                 <span class="upload-image-span">
-                                    <img src="route/file/downloadfile/false/{{item.fileId}}" align="加载失败">
+                                    <img src="route/file/download/false/{{item.fileId}}" align="加载失败">
                                 </span>
                                 <a class="layui-btn layui-btn-xs layui-btn-danger text-danger remove-image" href="javascript:void(0);" lay-form-button data-id="{{item.fileId}}" data-name="{{fileName}}" lay-filter="systemIconRemoveFile">
                                     <i class="fa fa-trash-o"></i>