Home Explore Help
Sign In
chenzl
/
fileView
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

预览优化

chenzl 10 months ago
parent
4a103b0501
commit
0b9d825337
9 changed files with 8 additions and 14 deletions
Unified View Show Diff Stats
  1. 2 2
      server/src/main/config/application.properties
  2. 0 2
      server/src/main/java/cn/keking/config/ConfigConstants.java
  3. 1 1
      server/src/main/java/cn/keking/web/controller/FileController.java
  4. 1 1
      server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
  5. 0 1
      server/src/main/resources/web/fileNotSupported.ftl
  6. 0 1
      server/src/main/resources/web/notTrustDir.html
  7. 0 1
      server/src/main/resources/web/notTrustHost.html
  8. 4 4
      server/src/main/resources/web/officeweb.ftl
  9. 0 1
      server/src/main/resources/web/tiff.ftl

+ 2 - 2
server/src/main/config/application.properties
View File 

@@ -116,9 +116,9 @@ pdf.bookmark.disable = ${KK_PDF_BOOKMARK_DISABLE:true}
 
 #是否禁止签名
 
 #是否禁止签名
 
 pdf.disable.editing = ${KK_PDF_DISABLE_EDITING:false}
 
 pdf.disable.editing = ${KK_PDF_DISABLE_EDITING:false}
 
 #office类型文档(word ppt)样式，默认为图片(image)，可配置为pdf（预览时也有按钮切换）
 
 #office类型文档(word ppt)样式，默认为图片(image)，可配置为pdf（预览时也有按钮切换）
 
-office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:image}
 
+office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:pdf}
 
 #是否关闭office预览切换开关，默认为false，可配置为true关闭
 
 #是否关闭office预览切换开关，默认为false，可配置为true关闭
 
-office.preview.switch.disabled = ${KK_OFFICE_PREVIEW_SWITCH_DISABLED:false}
 
+office.preview.switch.disabled = ${KK_OFFICE_PREVIEW_SWITCH_DISABLED:true}
 
 
 
 
 
 #水印内容
 
 #水印内容

+ 0 - 2
server/src/main/java/cn/keking/config/ConfigConstants.java
View File 

@@ -283,14 +283,12 @@ public class ConfigConstants {
 
     }
 
     }
 
 
 
     public static void setTrustHostValue(String trustHost) {
 
     public static void setTrustHostValue(String trustHost) {
 
-        System.err.println("trustHost---> " + trustHost);
 
         CopyOnWriteArraySet<String> trustHostSet;
 
         CopyOnWriteArraySet<String> trustHostSet;
 
         if (DEFAULT_TRUST_HOST.equalsIgnoreCase(trustHost)) {
 
         if (DEFAULT_TRUST_HOST.equalsIgnoreCase(trustHost)) {
 
             trustHostSet = new CopyOnWriteArraySet<>();
 
             trustHostSet = new CopyOnWriteArraySet<>();
 
         } else {
 
         } else {
 
             String[] trustHostArray = trustHost.toLowerCase().split(",");
 
             String[] trustHostArray = trustHost.toLowerCase().split(",");
 
             trustHostSet = new CopyOnWriteArraySet<>(Arrays.asList(trustHostArray));
 
             trustHostSet = new CopyOnWriteArraySet<>(Arrays.asList(trustHostArray));
 
-            System.err.println("trustHostSet---> " + trustHostSet.toString());
 
             setTrustHostSet(trustHostSet);
 
             setTrustHostSet(trustHostSet);
 
         }
 
         }
 
         setTrustHostSet(trustHostSet);
 
         setTrustHostSet(trustHostSet);

+ 1 - 1
server/src/main/java/cn/keking/web/controller/FileController.java
View File 

@@ -42,7 +42,7 @@ import static cn.keking.utils.CaptchaUtil.CAPTCHA_GENERATE_TIME;
 
  * @author yudian-it
 
  * @author yudian-it
 
  * 2017/12/1
 
  * 2017/12/1
 
  */
 
  */
 
-@RestController
 
+//@RestController
 
 public class FileController {
 
 public class FileController {
 
 
 
     private final Logger logger = LoggerFactory.getLogger(FileController.class);
 
     private final Logger logger = LoggerFactory.getLogger(FileController.class);

+ 1 - 1
server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
View File 

@@ -67,7 +67,7 @@ public class OnlinePreviewController {
 
         FileAttribute fileAttribute = fileHandlerService.getFileAttribute(fileUrl, req);
 
         FileAttribute fileAttribute = fileHandlerService.getFileAttribute(fileUrl, req);
 
         model.addAttribute("file", fileAttribute);
 
         model.addAttribute("file", fileAttribute);
 
         FilePreview filePreview = previewFactory.get(fileAttribute);
 
         FilePreview filePreview = previewFactory.get(fileAttribute);
 
-        logger.info("预览文件url：{}，previewType：{}", fileUrl, fileAttribute.getType());
 
+        logger.info("预览文件url：{}，previewType：{}, officePreviewType: {}", fileUrl, fileAttribute.getType(), fileAttribute.getOfficePreviewType());
 
         return filePreview.filePreviewHandle(fileUrl, model, fileAttribute);
 
         return filePreview.filePreviewHandle(fileUrl, model, fileAttribute);
 
     }
 
     }

+ 0 - 1
server/src/main/resources/web/fileNotSupported.ftl
View File 

@@ -38,7 +38,6 @@
 
         该(${fileType})文件，系统暂不支持在线预览，具体原因如下：
 
         该(${fileType})文件，系统暂不支持在线预览，具体原因如下：
 
         <p style="color: red;">${msg}</p>
 
         <p style="color: red;">${msg}</p>
 
     </span>
 
     </span>
 
-    <p>有任何疑问，请加入kk开源社区知识星球咨询：<a href="https://t.zsxq.com/09ZHSXbsQ">https://t.zsxq.com/09ZHSXbsQ</a><br></p>
 
 </div>
 
 </div>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 1
server/src/main/resources/web/notTrustDir.html
View File 

@@ -35,7 +35,6 @@
 
     <img src="images/sorry.jpg" />
 
     <img src="images/sorry.jpg" />
 
     <p>
 
     <p>
 
         预览源文件来自未授信的目录，请停止访问！<br>
 
         预览源文件来自未授信的目录，请停止访问！<br>
 
-        有任何疑问，请加入kk开源社区知识星球咨询：<a href="https://t.zsxq.com/09ZHSXbsQ">https://t.zsxq.com/09ZHSXbsQ</a><br>
 
     </p>
 
     </p>
 
 </div>
 
 </div>
 
 </body>
 
 </body>

+ 0 - 1
server/src/main/resources/web/notTrustHost.html
View File 

@@ -35,7 +35,6 @@
 
     <img src="images/sorry.jpg" />
 
     <img src="images/sorry.jpg" />
 
     <p>
 
     <p>
 
         预览源文件来自不受信任的站点：<span style="color: red; display: inline;">${current_host}</span> 请联系管理员！<br>
 
         预览源文件来自不受信任的站点：<span style="color: red; display: inline;">${current_host}</span> 请联系管理员！<br>
 
-        有任何疑问，请加入kk开源社区知识星球咨询：<a href="https://t.zsxq.com/09ZHSXbsQ">https://t.zsxq.com/09ZHSXbsQ</a><br>
 
     </p>
 
     </p>
 
 </div>
 
 </div>
 
 </body>
 
 </body>

+ 4 - 4
server/src/main/resources/web/officeweb.ftl
View File 

@@ -60,10 +60,10 @@
 
 <body>
 
 <body>
 
 <div id="lucky-mask-demo" style="position: absolute;z-index: 1000000;left: 0px;top: 0px;bottom: 0px;right: 0px; background: rgba(255, 255, 255, 0.8); text-align: center;font-size: 40px;align-items:center;justify-content: center;display: none;">加载中</div>
 
 <div id="lucky-mask-demo" style="position: absolute;z-index: 1000000;left: 0px;top: 0px;bottom: 0px;right: 0px; background: rgba(255, 255, 255, 0.8); text-align: center;font-size: 40px;align-items:center;justify-content: center;display: none;">加载中</div>
 
 <p style="text-align:center;">
 
 <p style="text-align:center;">
 
-<div id="button-area">
 
-    <label><button onclick="tiaozhuan()">跳转HTML预览</button></label>
 
-    <button id="confirm-button" onclick="print()">打印</button>
 
-</div>
 
+<#--<div id="button-area">-->
 
+<#--    <label><button onclick="tiaozhuan()">跳转HTML预览</button></label>-->
 
+<#--    <button id="confirm-button" onclick="print()">打印</button>-->
 
+<#--</div>-->
 
 <div id="luckysheet" style="margin:0px;padding:0px;position:absolute;width:100%;left: 0px;top: 20px;bottom: 0px;outline: none;"></div>
 
 <div id="luckysheet" style="margin:0px;padding:0px;position:absolute;width:100%;left: 0px;top: 20px;bottom: 0px;outline: none;"></div>
 
 
 
 <script src="xlsx/luckyexcel.umd.js"></script>
 
 <script src="xlsx/luckyexcel.umd.js"></script>

+ 0 - 1
server/src/main/resources/web/tiff.ftl
View File 

@@ -105,7 +105,6 @@ html += "    <span>";
 
 html += "        该(tif)文件，系统解析错误，具体原因如下：";
 
 html += "        该(tif)文件，系统解析错误，具体原因如下：";
 
 html += "        <p style=\"color: red;\">文件[${file.name}]解析失败，请联系系统管理员</p>";
 
 html += "        <p style=\"color: red;\">文件[${file.name}]解析失败，请联系系统管理员</p>";
 
 html += "    </span>";
 
 html += "    </span>";
 
-html += "    <p>有任何疑问，请加入kk开源社区知识星球咨询：<a href=\"https://t.zsxq.com/09ZHSXbsQ\">https://t.zsxq.com/09ZHSXbsQ</a><br></p>";
 
 html += "</div>";
 
 html += "</div>";
 
 html += "</body>";
 
 html += "</body>";
 
 html += "</html>";
 
 html += "</html>";