From 56d9906c74c908dcbf5f2ab6dc3704a83f2c95bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com> Date: Fri, 17 Dec 2021 17:18:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dppt=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E5=9C=A8=E6=94=B9=E8=BF=87context-path=E5=90=8E=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=BC=82=E5=B8=B8=20(#311)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/src/main/resources/web/ppt.ftl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/server/src/main/resources/web/ppt.ftl b/server/src/main/resources/web/ppt.ftl index 936bd4de..29d0b08d 100644 --- a/server/src/main/resources/web/ppt.ftl +++ b/server/src/main/resources/web/ppt.ftl @@ -43,11 +43,11 @@ - + - + - + @@ -79,7 +79,7 @@
-
加载中...
+
加载中...
@@ -139,9 +139,9 @@ - - - + + + - - + + From 0c93c7e4b6a9f20be9579e3c1198f657c159be57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com> Date: Fri, 17 Dec 2021 17:22:31 +0800 Subject: [PATCH 2/3] update README --- README.en.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.en.md b/README.en.md index 1c6be4f7..2f032923 100644 --- a/README.en.md +++ b/README.en.md @@ -1,4 +1,4 @@ -# file-online-preview +# kkFileView [![GitHub license](https://img.shields.io/github/license/kekingcn/kkFileView.svg?style=flat-square)](https://github.com/kekingcn/kkFileView/blob/master/LICENSE) diff --git a/README.md b/README.md index 4d0fda00..3aeb5209 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# file-online-preview +# kkFileView 此项目为文件文档在线预览项目解决方案,对标业内付费产品有【[永中office](http://dcs.yozosoft.com/)】【[office365](http://www.officeweb365.com/)】【[idocv](https://www.idocv.com/)】等,在取得公司高层同意后以Apache协议开源出来反哺社区,在此特别感谢@唐老大的支持以及@端木详笑的贡献。该项目使用流行的spring boot搭建,易上手和部署,基本支持主流办公文档的在线预览,如doc,docx,Excel,pdf,txt,zip,rar,图片等等 ### 项目特性 From 97542b06fa8509060ac73f02417e763f0059a12e Mon Sep 17 00:00:00 2001 From: gitchenjh <842761733@qq.com> Date: Fri, 17 Dec 2021 17:31:32 +0800 Subject: [PATCH 3/3] Create maven.yml add Github Action --- .github/workflows/maven.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..3086db6a --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,24 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml