From d83ba37ebb8fbbc5d212e37cd2828c72fddddf6d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 九月 2023 18:08:06 +0800
Subject: [PATCH] 1
---
src/main/resources/application-scheduled.yml | 4 ++--
src/main/resources/application-dev.yml | 2 +-
src/main/java/com/yssh/service/SuYuanService.java | 2 +-
pom.xml | 6 +++---
src/main/resources/application-file.yml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 140f9bd..14bae42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<relativePath/>
</parent>
<!--鎵撳寘鎴恓ar銆亀ar-->
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<groupId>com</groupId>
<artifactId>yssh</artifactId>
@@ -53,10 +53,10 @@
<artifactId>spring-boot-starter-web</artifactId>
<!--鎺掗櫎鍐呯疆tomcat瀹瑰櫒锛岃澶栭儴瀹瑰櫒杩愯spring-boot椤圭洰-->
<exclusions>
- <!--exclusion>
+ <exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion-->
+ </exclusion>
<!--<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
diff --git a/src/main/java/com/yssh/service/SuYuanService.java b/src/main/java/com/yssh/service/SuYuanService.java
index 2d01143..889fd13 100644
--- a/src/main/java/com/yssh/service/SuYuanService.java
+++ b/src/main/java/com/yssh/service/SuYuanService.java
@@ -103,7 +103,7 @@
}
public Map<String, Object> selectSuYuan100(String name, Date date) {
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<>();
MonitorPointPosition checkPoint = commonService.select3dCheckPointByName(name);
if (StringUtils.isNull(checkPoint)) {
return null;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b4b6d33..6158046 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.20.228:3306/yssh?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.22.31:3306/yssh?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 鍒濆杩炴帴鏁�
diff --git a/src/main/resources/application-file.yml b/src/main/resources/application-file.yml
index 6bd846f..c35204b 100644
--- a/src/main/resources/application-file.yml
+++ b/src/main/resources/application-file.yml
@@ -4,7 +4,7 @@
filePath3d: E:\yssh_data\dat\correct_jk_47.dat
#csv閰嶇疆璺緞
csv:
- filePath: E:\yssh_data\LBM-NEW
+ filePath: F:\0911\LBM-NEW
vocPath: E:\yssh_data\VOC_ALL
#鏃�/鍛�/鏈堟姤璺緞
report:
diff --git a/src/main/resources/application-scheduled.yml b/src/main/resources/application-scheduled.yml
index 3820fbc..ca205c3 100644
--- a/src/main/resources/application-scheduled.yml
+++ b/src/main/resources/application-scheduled.yml
@@ -1,8 +1,8 @@
csv:
# 221Mb CSV鍏ュ簱鏃堕棿
- cron: '0 45 * * * ?'
+ cron: '0 35 * * * ?'
cron_max: 720
# 112Kb CSV鍏ュ簱鏃堕棿
voc: '0 40 * * * ?'
- voc_max: 720
+ voc_max: 96
--
Gitblit v1.9.3