From bf27e24f68cf41a07ba0e5c4dc6ac1c086b6652d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 四月 2023 17:01:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/ExpPointServerImpl.java | 4 +
src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java | 4 +
src/main/java/com/yssh/scheduled/ReadCsvTask.java | 4 +
src/main/java/com/yssh/service/impl/AlertConfigServiceImpl.java | 6 ++-
src/main/java/com/yssh/service/impl/CommonServiceImpl.java | 6 ++-
src/main/resources/logback.xml | 2
pom.xml | 32 +++++++++++----
src/main/java/com/yssh/run/InitDataRunner.java | 7 ++-
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 4 +
src/main/java/com/yssh/service/impl/AsyncServiceImpl.java | 4 +
src/main/java/com/yssh/service/impl/ForecastAnalyseServiceImpl.java | 4 +
src/main/java/com/yssh/utils/CsvParser.java | 4 +
src/main/resources/application.yml | 4 -
13 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0d90f91..a2b47dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
</properties>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.3</version>
@@ -32,6 +32,24 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.3</version>
+ </dependency-->
+ <!--log4j-->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.1.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -61,7 +79,7 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
- <!-- <dependency>娣诲姞Swagger渚濊禆
+ <!--<dependency>娣诲姞Swagger渚濊禆
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.7.0</version>
@@ -70,14 +88,12 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.7.0</version>
- </dependency> -->
-
- <!-- <dependency>
+ </dependency>-->
+ <!--<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>3.0.0</version>
- </dependency> -->
-
+ </dependency>-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
@@ -141,14 +157,12 @@
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
-
<!-- 浜岀淮绌洪棿璋撹瘝鍜屽嚱鏁扮殑Java API -->
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.2</version>
</dependency>
-
<!-- geotools渚濊禆 -->
<dependency>
<groupId>org.geotools</groupId>
diff --git a/src/main/java/com/yssh/run/InitDataRunner.java b/src/main/java/com/yssh/run/InitDataRunner.java
index 0080de9..7d7271b 100644
--- a/src/main/java/com/yssh/run/InitDataRunner.java
+++ b/src/main/java/com/yssh/run/InitDataRunner.java
@@ -1,6 +1,8 @@
package com.yssh.run;
import com.yssh.utils.CacheUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,8 +15,7 @@
@Component
public class InitDataRunner implements ApplicationRunner {
-
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Autowired
private ICommonService commonService;
@@ -32,5 +33,7 @@
}
//璇诲彇dat鏁版嵁
commonService.readDatData();
+
+ logger.info("***************** 绯荤粺鍚姩瀹屾瘯 *****************" + "\n");
}
}
diff --git a/src/main/java/com/yssh/scheduled/ReadCsvTask.java b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
index f0f111c..be21d76 100644
--- a/src/main/java/com/yssh/scheduled/ReadCsvTask.java
+++ b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
@@ -6,6 +6,8 @@
import java.util.Calendar;
import java.util.Date;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@
@Component
public class ReadCsvTask {
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Autowired
private CsvFilePathConfig csvFilePathConfig;
diff --git a/src/main/java/com/yssh/service/impl/AlertConfigServiceImpl.java b/src/main/java/com/yssh/service/impl/AlertConfigServiceImpl.java
index fe24f15..de50df9 100644
--- a/src/main/java/com/yssh/service/impl/AlertConfigServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/AlertConfigServiceImpl.java
@@ -2,6 +2,8 @@
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +18,8 @@
@Service
public class AlertConfigServiceImpl implements IAlertConfigService {
-
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Autowired
private AlertConfigMapper alertConfigMapper;
diff --git a/src/main/java/com/yssh/service/impl/AsyncServiceImpl.java b/src/main/java/com/yssh/service/impl/AsyncServiceImpl.java
index 72c6dfc..98f1060 100644
--- a/src/main/java/com/yssh/service/impl/AsyncServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/AsyncServiceImpl.java
@@ -3,6 +3,8 @@
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -14,7 +16,7 @@
@Service
public class AsyncServiceImpl implements IAsyncService {
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Override
diff --git a/src/main/java/com/yssh/service/impl/CommonServiceImpl.java b/src/main/java/com/yssh/service/impl/CommonServiceImpl.java
index 0d979d1..fc74cdb 100644
--- a/src/main/java/com/yssh/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/CommonServiceImpl.java
@@ -10,6 +10,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +27,8 @@
@Service
public class CommonServiceImpl implements ICommonService {
-
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ protected final Log logger = LogFactory.getLog(this.getClass());
private static final String TABLE_SCHEMA = "yssh";
diff --git a/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java b/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java
index e844a91..0a5c8ae 100644
--- a/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java
+++ b/src/main/java/com/yssh/service/impl/ExpPointServerImpl.java
@@ -7,6 +7,8 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.geotools.geojson.geom.GeometryJSON;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
@@ -30,7 +32,7 @@
@Service
public class ExpPointServerImpl implements IExpPointServer {
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Autowired
private ExpPointMapper expPointMapper;
diff --git a/src/main/java/com/yssh/service/impl/ForecastAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/ForecastAnalyseServiceImpl.java
index dff9ef8..9284849 100644
--- a/src/main/java/com/yssh/service/impl/ForecastAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/ForecastAnalyseServiceImpl.java
@@ -6,6 +6,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@
@Service
public class ForecastAnalyseServiceImpl implements IForecastAnalyseService{
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Autowired
private ICommonService commonService;
diff --git a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
index 22f21ec..8e57d66 100644
--- a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
@@ -10,6 +10,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +43,7 @@
@Service
public class SuYuanServiceImpl implements ISuYuanService {
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Resource
private SuYuanMapper suYuanMapper;
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index dd31379..a391d68 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -10,6 +10,8 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +41,7 @@
@Service
public class WarningAnalyseServiceImpl implements IWarningAnalyseService {
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
@Resource
private WarningDetailMapper warningDetailMapper;
diff --git a/src/main/java/com/yssh/utils/CsvParser.java b/src/main/java/com/yssh/utils/CsvParser.java
index 1808472..fa374a2 100644
--- a/src/main/java/com/yssh/utils/CsvParser.java
+++ b/src/main/java/com/yssh/utils/CsvParser.java
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -12,7 +14,7 @@
public class CsvParser extends AbstractCsvFileParser<SuYuan>{
- protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ protected final Log logger = LogFactory.getLog(this.getClass());
/**
* 姣忛殧3000鏉″瓨鍌ㄦ暟鎹簱锛岀劧鍚庢竻鐞唋ist 锛屾柟渚垮唴瀛樺洖鏀�
*/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e1d191c..9f6c86b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -29,9 +29,7 @@
# 鏃ュ織閰嶇疆
logging:
- level:
- com.yssh: info
- org.springframework: warn
+ config: classpath:logback.xml
#MyBatis閰嶇疆
mybatis:
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 0b7d4b3..8f79d64 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- scan 閰嶇疆鏂囦欢濡傛灉鍙戠敓鏀瑰彉锛屽皢浼氳閲嶆柊鍔犺浇 scanPeriod 妫�娴嬮棿闅旀椂闂�-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
- <contextName>LFServer</contextName>
+ <contextName>yssh</contextName>
<!-- 鏂囦欢鍚嶇О -->
<property name="log.name.info" value="info" />
--
Gitblit v1.9.3