增加百度统计信息

Merge pull request !154 from lujiaming/N/A

Dockerfile

@@ -1,5 +1,5 @@
 FROM keking/kkfileview-jdk:latest
 MAINTAINER chenjh "842761733@qq.com"
 ADD server/target/kkFileView-*.tar.gz /opt/
-ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.3.0/bin
+ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.4.0-SNAPSHOT/bin
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.3.0/config/application.properties","-jar","/opt/kkFileView-4.3.0/bin/kkFileView-4.3.0.jar"]
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0-SNAPSHOT/config/application.properties","-jar","/opt/kkFileView-4.4.0-SNAPSHOT/bin/kkFileView-4.4.0-SNAPSHOT.jar"]

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>kkFileView-parent</artifactId>
-    <version>4.3.0</version>
+    <version>4.4.0-SNAPSHOT</version>
 
     <properties>
         <java.version>1.8</java.version>

server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>kkFileView-parent</artifactId>
         <groupId>cn.keking</groupId>
-        <version>4.3.0</version>
+        <version>4.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>kkFileView</artifactId>

server/src/main/bin/startup.bat

@@ -7,4 +7,4 @@ echo Please check log file in ../log/kkFileView.log for more information
 echo You can get help in our official home site: https://kkview.cn
 echo If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ
 echo If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers
-java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.3.0.jar -> ..\log\kkFileView.log
+java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.4.0-SNAPSHOT.jar -> ..\log\kkFileView.log

server/src/main/bin/startup.sh

@@ -51,7 +51,7 @@ else
 
   ## 启动kkFileView
   echo "Starting kkFileView..."
-  nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.3.0.jar > ../log/kkFileView.log 2>&1 &
+  nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0-SNAPSHOT.jar > ../log/kkFileView.log 2>&1 &
   echo "Please execute ./showlog.sh to check log for more information"
   echo "You can get help in our official home site: https://kkview.cn"
   echo "If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ"

server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java

@@ -6,7 +6,6 @@ import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
 import cn.keking.service.FileHandlerService;
-import cn.keking.web.filter.BaseUrlFilter;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.poi.EncryptedDocumentException;
 import org.springframework.stereotype.Service;
@@ -37,7 +36,6 @@ public class PdfFilePreviewImpl implements FilePreview {
     public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
         String fileName = fileAttribute.getName();
         String officePreviewType = fileAttribute.getOfficePreviewType();
-        String baseUrl = BaseUrlFilter.getBaseUrl();
         boolean forceUpdatedCache=fileAttribute.forceUpdatedCache();
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
         String outFilePath = FILE_DIR + pdfName;

server/src/main/resources/banner.txt

@@ -7,7 +7,7 @@
  |_|\_\ |_|\_\ |_|      |_| |_|  \___|     \/     |_|  \___|   \_/\_/
 
  => Spring Boot             ::  ${spring-boot.version}
- => kkFileView              ::  4.3.0
+ => kkFileView              ::  4.4.0-SNAPSHOT
  => Home site               ::  https://kkview.cn
  => Github                  ::  https://github.com/kekingcn/kkFileView
  => Gitee                   ::  https://gitee.com/kekingcn/file-online-preview

server/src/main/resources/static/xlsx/demoData/sheetConditionFormat.js

@@ -6450,7 +6450,34 @@ window.sheetConditionFormat = {
 		"conditionName": "occurrenceDate",
 		"conditionRange": [],
 		"conditionValue": ["2020/07/23 - 2020/07/29"]
-	}, {
+	},{
+		"type": "default",
+		"cellrange": [{
+			"row": [10, 19],
+			"column": [0, 0]
+		}],
+		"format": {
+			"textColor": "#000000",
+			"cellColor": "#ff0000"
+		},
+		"conditionName": "regExp",
+		"conditionRange": [],
+		"conditionValue": [/^\d{1,}\.\d{1,}$/]
+	},{
+		"type": "default",
+		"cellrange": [{
+			"row": [0, 9],
+			"column": [0, 0]
+		}],
+		"format": {
+			"textColor": "#000000",
+			"cellColor": "#ff0000"
+		},
+		"conditionName": "sort",
+		"conditionRange": [],
+		"conditionValue": ['desc']
+	},
+	{
 		"type": "colorGradation",
 		"cellrange": [{
 			"left": 422,

server/src/main/resources/static/xlsx/expendPlugins/print/print.css

@@ -0,0 +1,46 @@
+.luckysheet-print span[role="heading"] {
+    font-size: 30px;
+    font-weight: bold;
+}
+
+.luckysheet-print-suggest {
+    font-size: 12px;
+}
+
+.luckysheet-print-title {
+    font-weight: bold;
+    font-size: 18px;
+}
+
+.luckysheet-print-radio {
+    display: flex;
+}
+
+.luckysheet-print-radio > div {
+    width: 50%;
+}
+
+.luckysheet-print select {
+    height: 30px;
+}
+
+.luckysheet-print .luckysheet-modal-dialog-buttons {
+    display: flex;
+    flex-direction: row-reverse;
+}
+
+.luckysheet-print-box canvas {
+    display: block;
+}
+
+@media print {
+    :not(html, head, body, .luckysheet-print-preview, .luckysheet-print-preview *) {
+        display: none;
+    }
+    .luckysheet-print-break {
+        page-break-after: always;
+    }
+    #print-layout-options {
+        display: none;
+    }
+}

server/src/main/resources/static/xlsx/index.html

@@ -2,13 +2,14 @@
 <html>
     <head>
         <meta charset="UTF-8" />
-        <title>Hello xlsx!</title>
+        <title>xlsx在线预览</title>
         <link rel='stylesheet' href='plugins/css/pluginsCss.css' />
         <link rel='stylesheet' href='plugins/plugins.css' />
         <link rel='stylesheet' href='css/luckysheet.css' />
         <link rel='stylesheet' href='assets/iconfont/iconfont.css' />
         <script src="plugins/js/plugin.js"></script>
         <script src="luckysheet.umd.js"></script>
+        <script src="../js/base64.min.js" type="text/javascript"></script>
     </head>
     <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;">Downloading</div>
@@ -17,56 +18,67 @@
 		<div id="luckysheet" style="margin:0px;padding:0px;position:absolute;width:100%;left: 0px;top: 50px;bottom: 0px;outline: none;"></div>
         <script src="luckyexcel.umd.js"></script>
         <script>
-            function demoHandler(){
+       let str =location.search;
-           
+       let search =str.substr(1);
+        //console.log(search); 
+           search = Base64.decode(decodeURIComponent(search));
+         //  console.log(search); 
+          
                 let mask = document.getElementById("lucky-mask-demo");
-
+                    function loadText() {
-                    window.onload = () => {
+                            var value = search;
-                            var value = 'kex.xlsx';
+                            var name = 'xlsx.xlsx';
-                            var name = 'xlsx';
                             if(value==""){
                                 return;
                             }
-                          //  mask.style.display = "flex";
+                           // mask.style.display = "flex";
                             LuckyExcel.transformExcelToLuckyByUrl(value, name, function(exportJson, luckysheetfile){
-                                
                                 if(exportJson.sheets==null || exportJson.sheets.length==0){
-                                    alert("Failed to read the content of the excel file, currently does not support xls files!");
+                                    alert("读取excel文件内容失败!");
                                     return;
                                 }
-                              //  console.log(exportJson, luckysheetfile);
                                 mask.style.display = "none";
                                 window.luckysheet.destroy();
-                                
                                 window.luckysheet.create({
-                                    container: 'luckysheet', //luckysheet is the container id
+                                container: 'luckysheet', //luckysheet is the container id
-									lang: "zh",
+                                lang: "zh",
+                             showtoolbarConfig:{
+                             image: true,
+                             print: false, //关闭打印按钮  启用也不能用 等以后看情况而定
+                             exportXlsx: false, //关闭导出按钮  启用也不能用  等以后看情况而定
+                                  },
+
                                allowCopy: true, // 是否允许拷贝
                                showtoolbar: true, // 是否显示工具栏
                                showinfobar: false, // 是否显示顶部信息栏
+                               // myFolderUrl: "/",//作用：左上角<返回按钮的链接
                                showsheetbar: true, // 是否显示底部sheet页按钮
                                showstatisticBar: true, // 是否显示底部计数栏
-                               sheetBottomConfig: false, // sheet页下方的添加行按钮和回到顶部按钮配置
+                               sheetBottomConfig: true, // sheet页下方的添加行按钮和回到顶部按钮配置
                                allowEdit: true, // 是否允许前台编辑
                                enableAddRow: false, // 允许增加行
                                enableAddCol: false, // 允许增加列
                                userInfo: false, // 右上角的用户信息展示样式
                                showRowBar: true, // 是否显示行号区域
                                showColumnBar: false, // 是否显示列号区域
-                               sheetFormulaBar: true, // 是否显示公式栏
+                               sheetFormulaBar: false, // 是否显示公式栏
                                enableAddBackTop: true,//返回头部按钮
-                                
+                               forceCalculation: false, //下面是导出插件 默认关闭
+                               enableAddRow: false, // 允许增加行
+                               plugins: [{ name: 'chart' }, { name: 'exportXlsx', config: { url: 'luckyToXlsx' } }, {
+                               name: 'print', config: {
+                               license: ''
+                               }
+                               }],
                                     data:exportJson.sheets,
                                     title:exportJson.info.name,
                                     userInfo:exportJson.info.name.creator
                                 });
                             });
-                       
-
                     }
 
-            }
+   loadText();
-            demoHandler();
+
         </script>
     </body>
 </html>

server/src/main/resources/web/commonHeader.ftl

@@ -27,6 +27,14 @@
             });
         }
     }
+
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
 </script>
 
 <style>

server/src/main/resources/web/fileNotSupported.ftl

@@ -40,5 +40,15 @@
     </span>
     <p>有任何疑问，请加入kk开源社区知识星球咨询：<a href="https://t.zsxq.com/09ZHSXbsQ">https://t.zsxq.com/09ZHSXbsQ</a><br></p>
 </div>
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
+
 </body>
 </html>

server/src/main/resources/web/main/index.ftl

@@ -312,6 +312,14 @@
         }
         return true;
     }
+
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
 </script>
 </body>
 </html>

server/src/main/resources/web/main/integrated.ftl

@@ -93,6 +93,14 @@
         </div>
     </div>
 </div>
-
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
 </body>
 </html>

server/src/main/resources/web/main/record.ftl

@@ -339,5 +339,15 @@
     </div>
 </div>
 </div>
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
+
 </body>
 </html>

server/src/main/resources/web/main/sponsor.ftl

@@ -85,6 +85,14 @@
         </table>
     </div>
 </div>
-
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
 </body>
 </html>

server/src/main/resources/web/notTrustDir.html

@@ -38,5 +38,15 @@
         有任何疑问，请加入kk开源社区知识星球咨询：<a href="https://t.zsxq.com/09ZHSXbsQ">https://t.zsxq.com/09ZHSXbsQ</a><br>
     </p>
 </div>
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
+
 </body>
 </html>

server/src/main/resources/web/notTrustHost.html

@@ -38,5 +38,15 @@
         有任何疑问，请加入kk开源社区知识星球咨询：<a href="https://t.zsxq.com/09ZHSXbsQ">https://t.zsxq.com/09ZHSXbsQ</a><br>
     </p>
 </div>
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
+
 </body>
 </html>

server/src/main/resources/web/officeweb.ftl

@@ -140,6 +140,14 @@
             document.querySelector('#print-area').style.display = 'block';
             document.querySelector('#button-area').style.display = 'none';
         }
+
+            var _hmt = _hmt || [];
+            (function() {
+                var hm = document.createElement("script");
+                hm.src = "https://hm.baidu.com/hm.js?a9e1d1e1aa9e5435c653c424364f284a";
+                var s = document.getElementsByTagName("script")[0];
+                s.parentNode.insertBefore(hm, s);
+            })();
         </script>
     </body>
 </html>