修改maven依赖版本以及发布版本号

This commit is contained in:
李玉民 2025-04-04 21:22:57 +08:00
parent b85edde635
commit b42c2a8db7
6 changed files with 49 additions and 49 deletions

View File

@ -1,4 +1,4 @@
FROM ymlisoft/kkfileview-base:4.4.0
ADD server/target/kkFileView-*.tar.gz /opt/
ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-4.4.0/bin
ENTRYPOINT ["java","$JAVA_OPTS","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0/config/application.properties","-jar","/opt/kkFileView-4.4.0/bin/kkFileView-4.4.0.jar"]
ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-4.4.0-1/bin
ENTRYPOINT ["java","$JAVA_OPTS","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0-1/config/application.properties","-jar","/opt/kkFileView-4.4.0-1/bin/kkFileView-4.4.0-1.jar"]

16
pom.xml
View File

@ -6,23 +6,23 @@
<groupId>cn.keking</groupId>
<artifactId>kkFileView-parent</artifactId>
<version>4.4.0</version>
<version>4.4.0-1</version>
<properties>
<java.version>21</java.version>
<jodconverter.version>4.4.6</jodconverter.version>
<spring.boot.version>2.5.15</spring.boot.version>
<jodconverter.version>4.4.8</jodconverter.version>
<spring.boot.version>2.7.18</spring.boot.version>
<poi.version>5.4.0</poi.version>
<xdocreport.version>1.0.6</xdocreport.version>
<xstream.version>1.4.21</xstream.version>
<junrar.version>7.5.5</junrar.version>
<redisson.version>3.6.5</redisson.version>
<redisson.version>3.45.1</redisson.version>
<sevenzipjbinding.version>16.02-2.01</sevenzipjbinding.version>
<jchardet.version>1.0</jchardet.version>
<antlr.version>2.7.7</antlr.version>
<concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
<rocksdb.version>5.17.2</rocksdb.version>
<pdfbox.version>3.0.2</pdfbox.version>
<pdfbox.version>3.0.4</pdfbox.version>
<jai-imageio.version>1.4.0</jai-imageio.version>
<jbig2-imageio.version>3.0.4</jbig2-imageio.version>
<galimatias.version>0.2.1</galimatias.version>
@ -37,9 +37,9 @@
<juniversalchardet.version>1.0.3</juniversalchardet.version>
<httpcomponents.version>4.5.14</httpcomponents.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-net.version>3.9.0</commons-net.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
<commons-cli.version>1.9.0</commons-cli.version>
<commons-net.version>3.11.1</commons-net.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<maven.compiler.source>${java.version}</maven.compiler.source>

View File

@ -6,7 +6,7 @@
<parent>
<artifactId>kkFileView-parent</artifactId>
<groupId>cn.keking</groupId>
<version>4.4.0</version>
<version>4.4.0-1</version>
</parent>
<artifactId>kkFileView</artifactId>
@ -20,6 +20,18 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.3.39</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -5,6 +5,6 @@ echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
echo Starting kkFileView...
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 you need further help, please join our kk opensource community
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.4.0.jar -> ..\log\kkFileView.log
java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.4.0-1.jar -> ..\log\kkFileView.log

View File

@ -51,11 +51,11 @@ else
## 启动kkFileView
echo "Starting kkFileView..."
nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0.jar > ../log/kkFileView.log 2>&1 &
nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0-1.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"
echo "If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers"
echo "You can get help in our official home site"
echo "If you need further help, please join our kk opensource community"
echo "If this project is helpful to you, please star it on gitee"
PROCESS=$(ps -ef | grep -v grep | grep java | grep kkFileView | awk 'NR==1{print $2}')
# 启动成功后将进程号写入pid文件
echo "$PROCESS" > "$PID_FILE"

View File

@ -21,17 +21,17 @@ public class RedissonConfig {
private String address;
private int connectionMinimumIdleSize = 10;
private int idleConnectionTimeout=10000;
private int pingTimeout=1000;
private int connectTimeout=10000;
private int timeout=3000;
private int retryAttempts=3;
private int retryInterval=1500;
private int reconnectionTimeout=3000;
private int failedAttempts=3;
private int idleConnectionTimeout = 10000;
private int pingTimeout = 1000;
private int connectTimeout = 10000;
private int timeout = 3000;
private int retryAttempts = 3;
private int retryInterval = 1500;
private int reconnectionTimeout = 3000;
private int failedAttempts = 3;
private String password = null;
private int subscriptionsPerConnection=5;
private String clientName=null;
private int subscriptionsPerConnection = 5;
private String clientName = null;
private int subscriptionConnectionMinimumIdleSize = 1;
private int subscriptionConnectionPoolSize = 50;
private int connectionPoolSize = 64;
@ -39,37 +39,25 @@ public class RedissonConfig {
private boolean dnsMonitoring = false;
private int dnsMonitoringInterval = 5000;
private int thread; //当前处理核数量 * 2
private int thread; // 当前处理核数量 * 2
private String codec="org.redisson.codec.JsonJacksonCodec";
private String codec = "org.redisson.codec.JsonJacksonCodec";
@Bean
Config config() throws Exception {
Config config = new Config();
config.useSingleServer().setAddress(address)
.setConnectionMinimumIdleSize(connectionMinimumIdleSize)
.setConnectionPoolSize(connectionPoolSize)
.setDatabase(database)
.setDnsMonitoring(dnsMonitoring)
.setDnsMonitoringInterval(dnsMonitoringInterval)
.setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize)
.setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize)
.setSubscriptionsPerConnection(subscriptionsPerConnection)
.setClientName(clientName)
.setFailedAttempts(failedAttempts)
.setRetryAttempts(retryAttempts)
.setRetryInterval(retryInterval)
.setReconnectionTimeout(reconnectionTimeout)
.setTimeout(timeout)
.setConnectTimeout(connectTimeout)
.setIdleConnectionTimeout(idleConnectionTimeout)
.setPingTimeout(pingTimeout)
config.useSingleServer().setAddress(address).setConnectionMinimumIdleSize(connectionMinimumIdleSize).setConnectionPoolSize(connectionPoolSize).setDatabase(database)
// .setDnsMonitoring(dnsMonitoring)
.setDnsMonitoringInterval(dnsMonitoringInterval).setSubscriptionConnectionMinimumIdleSize(subscriptionConnectionMinimumIdleSize).setSubscriptionConnectionPoolSize(subscriptionConnectionPoolSize).setSubscriptionsPerConnection(subscriptionsPerConnection).setClientName(clientName).setRetryAttempts(retryAttempts).setRetryInterval(retryInterval)
// .setReconnectionTimeout(reconnectionTimeout)
.setTimeout(timeout).setConnectTimeout(connectTimeout).setIdleConnectionTimeout(idleConnectionTimeout)
// .setPingTimeout(pingTimeout)
.setPassword(StringUtils.trimToNull(password));
Codec codec=(Codec) ClassUtils.forName(getCodec(), ClassUtils.getDefaultClassLoader()).newInstance();
Codec codec = (Codec) ClassUtils.forName(getCodec(), ClassUtils.getDefaultClassLoader()).getDeclaredConstructor().newInstance();
config.setCodec(codec);
config.setThreads(thread);
config.setEventLoopGroup(new NioEventLoopGroup());
config.setUseLinuxNativeEpoll(false);
// config.setUseLinuxNativeEpoll(false);
return config;
}