diff --git a/jodconverter-web/pom.xml b/jodconverter-web/pom.xml index 3fed531b..7dfc2ff4 100644 --- a/jodconverter-web/pom.xml +++ b/jodconverter-web/pom.xml @@ -164,6 +164,9 @@ true + + src/main/conf + diff --git a/jodconverter-web/src/main/bin/.gitkeep b/jodconverter-web/src/main/bin/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/jodconverter-web/src/main/bin/startup.bat b/jodconverter-web/src/main/bin/startup.bat new file mode 100644 index 00000000..1a4e5f79 --- /dev/null +++ b/jodconverter-web/src/main/bin/startup.bat @@ -0,0 +1 @@ +java -jar jodconverter-web-1.5.8.RELEASE.jar -> ..\\log\\kkFileView.log \ No newline at end of file diff --git a/jodconverter-web/src/main/bin/startup.sh b/jodconverter-web/src/main/bin/startup.sh new file mode 100644 index 00000000..8e69920d --- /dev/null +++ b/jodconverter-web/src/main/bin/startup.sh @@ -0,0 +1,2 @@ +#!/bin/bash +nohup java -jar jodconverter-web-1.5.8.RELEASE.jar ../log/kkFileView.log 2>&1 & \ No newline at end of file diff --git a/jodconverter-web/src/main/conf/.gitkeep b/jodconverter-web/src/main/conf/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/jodconverter-web/src/main/conf/application.properties b/jodconverter-web/src/main/conf/application.properties new file mode 100644 index 00000000..3efa1975 --- /dev/null +++ b/jodconverter-web/src/main/conf/application.properties @@ -0,0 +1,30 @@ +server.port = 8012 +spring.http.encoding.charset = utf8 +## Freemarker 配置 +spring.freemarker.template-loader-path = classpath:/web/ +spring.freemarker.cache = false +spring.freemarker.charset = UTF-8 +spring.freemarker.check-template-location = true +spring.freemarker.content-type = text/html +spring.freemarker.expose-request-attributes = true +spring.freemarker.expose-session-attributes = true +spring.freemarker.request-context-attribute = request +spring.freemarker.suffix = .ftl + +##资源映射路径 +file.dir = D:\\kkFileview\\ +spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir} +## openoffice home路径 +office.home = C:\\Program Files (x86)\\OpenOffice 4 +server.tomcat.uri-encoding = UTF-8 +converted.file.charset = GBK +#文件上传限制 +spring.http.multipart.max-file-size=100MB +##文本类型 +simText = txt,html,xml,java,properties,mp3,mp4,sql +#多媒体类型 +media=mp3,mp4,flv, +#缓存实现类型,不配默认为JDK实现,可配置为redis实现(需要配置spring.redisson.address等参数) +#cache.type = redis +#redis连接 +#spring.redisson.address = 192.168.1.204:6379 \ No newline at end of file diff --git a/jodconverter-web/src/main/resources/application-dev.properties b/jodconverter-web/src/main/resources/application-dev.properties deleted file mode 100644 index 963db0f0..00000000 --- a/jodconverter-web/src/main/resources/application-dev.properties +++ /dev/null @@ -1,16 +0,0 @@ -##资源映射路径 -file.dir = C:\\Users\\yudian\\Desktop\\dev\\ -spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir} -## openoffice home路径 -office.home = C:\\Program Files (x86)\\OpenOffice 4 -server.tomcat.uri-encoding = UTF-8 -converted.file.charset = GBK -#文件上传限制 -spring.http.multipart.max-file-size=100MB -##文本类型 -simText = txt,html,xml,java,properties,mp3,mp4,sql -#多媒体类型 -media=mp3,mp4,flv,rmvb -#缓存及队列实现类型,默认为JDK实现,可选redis(需要加spring.redisson.address等配置) -#cache.type = redis -#spring.redisson.address = 192.168.1.204:6379 \ No newline at end of file diff --git a/jodconverter-web/src/main/resources/application-prod.properties b/jodconverter-web/src/main/resources/application-prod.properties deleted file mode 100644 index 1afd5ca1..00000000 --- a/jodconverter-web/src/main/resources/application-prod.properties +++ /dev/null @@ -1,11 +0,0 @@ -file.dir = /data/file-preview/convertedFile/ -spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir} -office.home = /opt/openoffice4 -server.tomcat.uri-encoding = utf-8 -converted.file.charset = utf-8 -spring.http.multipart.max-file-size = 100MB -simText = txt,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,log,htm,css,cnf -media=mp3,mp4,flv -cache.type = redis -spring.redisson.address = 10.19.140.7:6379 -spring.redisson.database = 0 \ No newline at end of file diff --git a/jodconverter-web/src/main/resources/application-uat.properties b/jodconverter-web/src/main/resources/application-uat.properties deleted file mode 100644 index 057f7953..00000000 --- a/jodconverter-web/src/main/resources/application-uat.properties +++ /dev/null @@ -1,12 +0,0 @@ -file.dir = /data/filepreview/ -spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir} -openOfficePath = 123 -office.home = /opt/openoffice4 -server.tomcat.uri-encoding = utf-8 -converted.file.charset = utf-8 -spring.http.multipart.max-file-size = 100MB -simText = txt,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,log,htm,css,cnf -media=mp3,mp4,flv -cache.type = redis -spring.redisson.address = 192.168.1.204:6379 -spring.redisson.database = 3 \ No newline at end of file diff --git a/jodconverter-web/src/main/resources/application.properties b/jodconverter-web/src/main/resources/application.properties deleted file mode 100644 index ed5c6706..00000000 --- a/jodconverter-web/src/main/resources/application.properties +++ /dev/null @@ -1,15 +0,0 @@ -server.port = 8012 -spring.http.encoding.charset = utf8 -## Freemarker 配置 -spring.freemarker.template-loader-path = classpath:/web/ -spring.freemarker.cache = false -spring.freemarker.charset = UTF-8 -spring.freemarker.check-template-location = true -spring.freemarker.content-type = text/html -spring.freemarker.expose-request-attributes = true -spring.freemarker.expose-session-attributes = true -spring.freemarker.request-context-attribute = request -spring.freemarker.suffix = .ftl - -#默认环境 -spring.profiles.active=dev \ No newline at end of file