From bcb278dd0b29f909b8b9826ef516f8c2d9d4aaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Mon, 25 Sep 2023 10:38:19 +0800
Subject: [PATCH 1/2] update main pages
---
.../cn/keking/service/FileHandlerService.java | 4 +-
.../java/cn/keking/utils/CaptchaUtil.java | 34 ++-
.../keking/web/controller/FileController.java | 16 +-
.../css/xlsx.css => excel/excel.css} | 0
.../resources/static/excel/excel.header.js | 56 +++++
server/src/main/resources/static/favicon.ico | Bin 0 -> 4353 bytes
server/src/main/resources/web/main/index.ftl | 235 ++++++------------
.../main/resources/web/main/integrated.ftl | 36 +--
server/src/main/resources/web/main/record.ftl | 101 +++++---
.../src/main/resources/web/main/sponsor.ftl | 43 +---
10 files changed, 249 insertions(+), 276 deletions(-)
rename server/src/main/resources/static/{bootstrap/css/xlsx.css => excel/excel.css} (100%)
create mode 100644 server/src/main/resources/static/excel/excel.header.js
diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java
index 28f495a9..0aae8722 100644
--- a/server/src/main/java/cn/keking/service/FileHandlerService.java
+++ b/server/src/main/java/cn/keking/service/FileHandlerService.java
@@ -175,8 +175,8 @@ public class FileHandlerService implements InitializingBean {
}
// 添加sheet控制头
sb.append("");
- sb.append("");
- sb.append("");
+ sb.append("");
+ sb.append("");
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/server/src/main/java/cn/keking/utils/CaptchaUtil.java b/server/src/main/java/cn/keking/utils/CaptchaUtil.java
index 0fe25262..db9dbdff 100644
--- a/server/src/main/java/cn/keking/utils/CaptchaUtil.java
+++ b/server/src/main/java/cn/keking/utils/CaptchaUtil.java
@@ -8,16 +8,14 @@ import java.util.Random;
public class CaptchaUtil {
- public static final String captcha_code = "captchaCode";
- public static final String captcha_generate_time = "captchaTime";
+ public static final String CAPTCHA_CODE = "captchaCode";
+ public static final String CAPTCHA_GENERATE_TIME = "captchaTime";
- private static final int width = 100;// 定义图片的width
- private static final int height = 30;// 定义图片的height
- private static final int codeLength = 4;// 定义图片上显示验证码的个数
- private static final int xx = 18;
- private static final int fontHeight = 28;
- private static final int codeY = 27;
- private static final char[] codeSequence = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+ private static final int WIDTH = 100;// 定义图片的width
+ private static final int HEIGHT = 30;// 定义图片的height
+ private static final int CODE_LENGTH = 4;// 定义图片上显示验证码的个数
+ private static final int FONT_HEIGHT = 28;
+ private static final char[] CODE_SEQUENCE = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', '2', '3', '4', '5', '6', '7', '8', '9'};
/**
@@ -28,23 +26,23 @@ public class CaptchaUtil {
public static BufferedImage generateCaptchaPic(final String captchaCode) {
Assert.notNull(captchaCode, "captchaCode must not be null");
// 定义图像buffer
- BufferedImage buffImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ BufferedImage buffImg = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
Graphics gd = buffImg.getGraphics();
Random random = new Random();
// 将图像填充为白色
gd.setColor(Color.WHITE);
- gd.fillRect(0, 0, width, height);
- Font font = new Font("Times New Roman", Font.BOLD, fontHeight);
+ gd.fillRect(0, 0, WIDTH, HEIGHT);
+ Font font = new Font("Times New Roman", Font.BOLD, FONT_HEIGHT);
gd.setFont(font);
// 画边框。
gd.setColor(Color.BLACK);
- gd.drawRect(0, 0, width - 1, height - 1);
+ gd.drawRect(0, 0, WIDTH - 1, HEIGHT - 1);
// 随机产生40条干扰线,使图象中的认证码不易被其它程序探测到。
gd.setColor(Color.BLACK);
for (int i = 0; i < 30; i++) {
- int x = random.nextInt(width);
- int y = random.nextInt(height);
+ int x = random.nextInt(WIDTH);
+ int y = random.nextInt(HEIGHT);
int xl = random.nextInt(12);
int yl = random.nextInt(12);
gd.drawLine(x, y, x + xl, y + yl);
@@ -57,7 +55,7 @@ public class CaptchaUtil {
blue = random.nextInt(255);
// 用随机产生的颜色将验证码绘制到图像中。
gd.setColor(new Color(red, green, blue));
- gd.drawString(captchaCode, 18, codeY);
+ gd.drawString(captchaCode, 18, 27);
return buffImg;
}
@@ -68,8 +66,8 @@ public class CaptchaUtil {
public static String generateCaptchaCode() {
Random random = new Random();
StringBuilder randomCode = new StringBuilder();
- for (int i = 0; i < codeLength; i++) {
- randomCode.append(codeSequence[random.nextInt(52)]);
+ for (int i = 0; i < CODE_LENGTH; i++) {
+ randomCode.append(CODE_SEQUENCE[random.nextInt(52)]);
}
return randomCode.toString();
}
diff --git a/server/src/main/java/cn/keking/web/controller/FileController.java b/server/src/main/java/cn/keking/web/controller/FileController.java
index 41330e7c..9a145d32 100644
--- a/server/src/main/java/cn/keking/web/controller/FileController.java
+++ b/server/src/main/java/cn/keking/web/controller/FileController.java
@@ -35,8 +35,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import static cn.keking.utils.CaptchaUtil.captcha_code;
-import static cn.keking.utils.CaptchaUtil.captcha_generate_time;
+import static cn.keking.utils.CaptchaUtil.CAPTCHA_CODE;
+import static cn.keking.utils.CaptchaUtil.CAPTCHA_GENERATE_TIME;
/**
* @author yudian-it
@@ -88,7 +88,7 @@ public class FileController {
logger.error(msg);
return ReturnResponse.failure(msg);
}
- WebUtils.removeSessionAttr(request, captcha_code); //删除缓存验证码
+ WebUtils.removeSessionAttr(request, CAPTCHA_CODE); //删除缓存验证码
return ReturnResponse.success();
}
@@ -105,16 +105,16 @@ public class FileController {
response.setHeader("Pragma", "no-cache");
response.setHeader("Cache-Control", "no-cache");
response.setDateHeader("Expires", -1);
- String captchaCode = WebUtils.getSessionAttr(request, captcha_code);
- long captchaGenerateTime = WebUtils.getLongSessionAttr(request, captcha_generate_time);
+ String captchaCode = WebUtils.getSessionAttr(request, CAPTCHA_CODE);
+ long captchaGenerateTime = WebUtils.getLongSessionAttr(request, CAPTCHA_GENERATE_TIME);
long timeDifference = DateUtils.calculateCurrentTimeDifference(captchaGenerateTime);
// 验证码为空,且生成验证码超过50秒,重新生成验证码
if (timeDifference > 50 && ObjectUtils.isEmpty(captchaCode)) {
captchaCode = CaptchaUtil.generateCaptchaCode();
// 更新验证码
- WebUtils.setSessionAttr(request, captcha_code, captchaCode);
- WebUtils.setSessionAttr(request, captcha_generate_time, DateUtils.getCurrentSecond());
+ WebUtils.setSessionAttr(request, CAPTCHA_CODE, captchaCode);
+ WebUtils.setSessionAttr(request, CAPTCHA_GENERATE_TIME, DateUtils.getCurrentSecond());
} else {
captchaCode = ObjectUtils.isEmpty(captchaCode) ? "wait" : captchaCode;
}
@@ -195,7 +195,7 @@ public class FileController {
return ReturnResponse.failure("密码 or 验证码为空,删除失败!");
}
- String expectedPassword = ConfigConstants.getDeleteCaptcha() ? WebUtils.getSessionAttr(request, captcha_code) : ConfigConstants.getPassword();
+ String expectedPassword = ConfigConstants.getDeleteCaptcha() ? WebUtils.getSessionAttr(request, CAPTCHA_CODE) : ConfigConstants.getPassword();
if (!password.equalsIgnoreCase(expectedPassword)) {
logger.error("删除文件【{}】失败,密码错误!", fileName);
diff --git a/server/src/main/resources/static/bootstrap/css/xlsx.css b/server/src/main/resources/static/excel/excel.css
similarity index 100%
rename from server/src/main/resources/static/bootstrap/css/xlsx.css
rename to server/src/main/resources/static/excel/excel.css
diff --git a/server/src/main/resources/static/excel/excel.header.js b/server/src/main/resources/static/excel/excel.header.js
new file mode 100644
index 00000000..eaa72bae
--- /dev/null
+++ b/server/src/main/resources/static/excel/excel.header.js
@@ -0,0 +1,56 @@
+/**创建一个div并固定在底部,将center中的所有a标签放在改div中**/
+$("body").append($("
").css({"width":"100%","height":"100%px","position":"fixed","top":"0","left":"0"
+ ,"background-color":"rgba(53, 53, 53, 1)","line-height":"30px","font-size":"13px"}).attr("id","excel-header-nav"));
+$("center").css("display", "none");
+var centerChildrenA = $("center").children("a");
+if (centerChildrenA.length === 0) {
+ $("#excel-header-nav").hide();
+}
+$(centerChildrenA).each(function (a, b) {
+ // 获取a标签对应的target的name值,并设置name对应标签的样式以避免锚点标签标题被覆盖
+ var href = $(b).attr("href");
+ var name = href.substr(1);
+ $("[name=" + name + "]").css({"display":"block","padding-top":"14.01px"});
+ $(b).css({"padding":"5px","border-right":"1px solid white","color":"#f9f9f9"});
+ $("#excel-header-nav").append(b);
+});
+/**给所有的table添加class=table table-striped样式**/
+$("table").addClass("table table-striped");
+/**
+ * openoffice,只有一个 colgroup,用col子标签来描述列,liboffice 每一列都是一个colgroup
+ * var meta = $("meta[name=generator]");
+ * LibreOffice //OpenOffice
+ * console.log(meta[0].content);
+ */
+/**计算表头宽度----start**/
+function ______getColgroupWidth(colgroups){
+ var twidth = 0;
+ $(colgroups).each(function (i, g) {
+ var w = $(g).attr("width");
+ var s = $(g).attr("span");
+ if(null==s || undefined==s){
+ s=1;
+ }
+ twidth +=1*w*s;
+ });
+ return twidth;
+}
+$("table").each(function (a, b) {
+ var twidth = 0;
+ var tableChildrenColgroup = $(b).children("colgroup");
+ if(0==tableChildrenColgroup.length){
+ }else if(1==tableChildrenColgroup.length){
+ var cols = tableChildrenColgroup.children("col");
+ if(0==cols.length){
+ twidth=______getColgroupWidth(tableChildrenColgroup);
+ }else{
+ $(cols).each(function (i, g) {
+ var w = $(g).attr("width");
+ twidth +=1*w;
+ });
+ }
+ }else{
+ twidth = ______getColgroupWidth(tableChildrenColgroup);
+ }
+ $(b).css({"width":twidth});
+});
\ No newline at end of file
diff --git a/server/src/main/resources/static/favicon.ico b/server/src/main/resources/static/favicon.ico
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..16309db2d7ae68d89e824e657b218a452aca13a2 100644
GIT binary patch
literal 4353
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
G=Klf6q1d$m
literal 0
HcmV?d00001
diff --git a/server/src/main/resources/web/main/index.ftl b/server/src/main/resources/web/main/index.ftl
index 0d2c1e60..964d854e 100644
--- a/server/src/main/resources/web/main/index.ftl
+++ b/server/src/main/resources/web/main/index.ftl
@@ -3,10 +3,9 @@
-
+
kkFileView演示首页
-
@@ -21,69 +20,49 @@
.alert {
width: 50%;
}
- #size{
- float:left;
-
- }
- <#-- 删除吗CSS样式 -->
- <#if deleteCaptcha >
-
- #if>
+<#-- 删除文件验证码弹窗 -->
+<#if deleteCaptcha >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#if>
+
@@ -148,10 +127,7 @@
- <#-- 删除吗弹窗 -->
- <#if deleteCaptcha >
-
- #if>
+
<#-- 预览测试 -->
@@ -160,7 +136,8 @@
<#if fileUploadDisable == false>
#if>
@@ -199,97 +176,47 @@
#if>
-
-
-
-
-
diff --git a/server/src/main/resources/web/main/record.ftl b/server/src/main/resources/web/main/record.ftl
index e8ac5d0f..729900eb 100644
--- a/server/src/main/resources/web/main/record.ftl
+++ b/server/src/main/resources/web/main/record.ftl
@@ -3,41 +3,28 @@
-
+
kkFileView版本记录
-
-
-
-
@@ -67,6 +54,7 @@
13.其他功能优化及已知问题修复
+
2023年07月04日,v4.3.0版本
@@ -95,9 +83,10 @@
20. 其他功能优化及已知问题修复
+
-
2023年04月18日,v4.2.1 版本
+ 2023年04月18日,v4.2.1版本
@@ -107,7 +96,7 @@
-
2023年04月13日,v4.2.0 版本
+ 2023年04月13日,v4.2.0版本
@@ -148,7 +137,7 @@
-
2022年12月14日,v4.1.0 版本
+ 2022年12月14日,v4.1.0版本
@@ -167,7 +156,7 @@
-
2021年7月6日,v4.0.0 版本
+ 2021年7月6日,v4.0.0版本
@@ -184,12 +173,11 @@
-
2021年6月17日,v3.6.0版本
+ 2021年06月17日,v3.6.0版本
- ** ofd 类型文件支持版本,本次版本重要功能均由社区开发贡献,感谢 @gaoxingzaq、@zhangxiaoxiao9527 的代码贡献
- **
+ ** ofd 类型文件支持版本,本次版本重要功能均由社区开发贡献,感谢 @gaoxingzaq、@zhangxiaoxiao9527 的代码贡献 **
1. 新增 ofd 类型文件预览支持,ofd 是国产的类似 pdf 格式的文件
2. 新增了 ffmpeg 视频文件转码预览支持,打开转码功能后,理论上支持所有主流视频的预览,如 rm、rmvb、flv 等
3. 美化了 ppt、pptx 类型文件预览效果,比之前版本好看太多
@@ -199,7 +187,43 @@
-
2021年1月28日
+ 2021年04月06日,v3.5.1版本
+
+
+
+ 3.5.1版本发布,修复已知问题
+ 1. 修复 tif、tiff 文件预览初始内存太小预览失败的问题
+ 2. 修复PDF预览模式跨域问题
+
+
+
+
+
+
2021年03月17日,v3.5.0版本
+
+
+
+ 2021 一季度 v3.5 性能升级版发布
+ 1. 新增 office-plugin 转换进程、任务超时可配置
+ 2. 更新 spring-boot 到最新的 v2.4.2 版本
+ 3. 新增 tiff 、tif 图像文件格式预览支持
+ 4. 新增依赖 highlightjs 代码文件预览高亮支持
+ 5. 新增 wps 文档预览支持
+ 6. 新增 stars 增长趋势图
+ 7. 新增启动完成,打印启动耗时、演示页访问地址
+ 8. 新增 kkFIleView 的 banner 信息
+ 9. 优化启动脚本
+ 10. 优化项目结构、优化 maven 结构
+ 11. 移除多余的 repositories 配置,移除针对 tomcat 的配置
+ 12. 优化下载文件 io 操作
+ 13. 修复:优化项目目录结构之后,windows下启动报错“找不到office组件”
+ 14. 修复:jodd.io.NetUtil.downloadFile下载大于16M文件报错问题
+
+
+
+
+
+
2021年1月28日,v3.3.1版本
@@ -228,7 +252,7 @@
-
2020年12月27日
+ 2020年12月27日,v3.3.0版本
@@ -254,7 +278,21 @@
-
2020年05月20日
+ 2020年08月12日,v2.2.1版本
+
+
+
+ 1. 支持纯文本预览原样格式输出
+ 2. 修复PDF预览出现文字缺失异常,升级pdf.js组件
+ 3. docker镜像底层使用ubuntu,镜像体积更小、构建更快
+ 4. 预览接口同时支持get和post请求
+ 5. 修复上传到demo中的压缩文件预览异常
+
+
+
+
+
+
2020年05月20日,v2.2.0版本
@@ -279,7 +317,7 @@
-
2019年06月18日
+ 2019年06月20日
-
diff --git a/server/src/main/resources/web/main/sponsor.ftl b/server/src/main/resources/web/main/sponsor.ftl
index 9a2cc7ca..57e87fe9 100644
--- a/server/src/main/resources/web/main/sponsor.ftl
+++ b/server/src/main/resources/web/main/sponsor.ftl
@@ -3,25 +3,13 @@
-
+
赞助开源
-
-
-
-
-
-
-
-
@@ -30,23 +18,14 @@
@@ -54,16 +33,16 @@
<#-- 接入说明 -->
-
From 94a76a72a4aef683edc4f54da9d9ea62b611919f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Mon, 25 Sep 2023 14:32:54 +0800
Subject: [PATCH 2/2] update index page
---
server/src/main/resources/web/main/index.ftl | 47 ++++++++++----------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/server/src/main/resources/web/main/index.ftl b/server/src/main/resources/web/main/index.ftl
index 964d854e..b292444e 100644
--- a/server/src/main/resources/web/main/index.ftl
+++ b/server/src/main/resources/web/main/index.ftl
@@ -8,7 +8,6 @@
-
@@ -35,11 +34,12 @@
删除文件
+
-
+
@@ -179,25 +179,24 @@
$("#deleteCaptchaImg").click(function() {
$("#deleteCaptchaImg").attr("src","${baseUrl}deleteFile/captcha?timestamp=" + new Date().getTime());
});
- function deleteFile(fileName) {
- $("#deleteCaptchaModal").modal("show");
- $("#deleteCaptchaConfirmBtn").click(function() {
- var deleteCaptchaText = $("#deleteCaptchaText").val();
- $.ajax({
- url: '${baseUrl}deleteFile?fileName=' + fileName +'&password=' + deleteCaptchaText,
- success: function(data) {
- if ("删除文件失败,密码错误!" === data.msg) {
- alert(data.msg);
- } else {
- //刷新验证码
- $("#deleteCaptchaImg").click();
- $('#table').bootstrapTable("refresh", {});
- $("#deleteCaptchaText").val("")
- $("#deleteCaptchaModal").modal("hide");
- }
- }
- })
+ $("#deleteCaptchaConfirmBtn").click(function() {
+ var fileName = $("#deleteCaptchaFileName").val();
+ var deleteCaptchaText = $("#deleteCaptchaText").val();
+ $.get('${baseUrl}deleteFile?fileName=' + fileName +'&password=' + deleteCaptchaText, function(data){
+ if ("删除文件失败,密码错误!" === data.msg) {
+ alert(data.msg);
+ } else {
+ $('#table').bootstrapTable("refresh", {});
+ $("#deleteCaptchaText").val("");
+ $("#deleteCaptchaModal").modal("hide");
+ }
});
+ });
+ function deleteFile(fileName) {
+ $("#deleteCaptchaImg").click();
+ $("#deleteCaptchaFileName").val(fileName);
+ $("#deleteCaptchaText").val("");
+ $("#deleteCaptchaModal").modal("show");
}
<#else>
function deleteFile(fileName) {