Skip to content

Commit dc01d17

Browse files
enjoyCoding666enjoyCoding666
committed
修改日志框架
1 parent e0c70e9 commit dc01d17

17 files changed

Lines changed: 105 additions & 224 deletions

File tree

‎pom.xml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,17 @@
2424
<!-- 日志文件管理包 -->
2525
<!-- log start -->
2626
<dependency>
27-
<groupId>log4j</groupId>
28-
<artifactId>log4j</artifactId>
29-
<version>1.2.17</version>
27+
<groupId>org.slf4j</groupId>
28+
<artifactId>slf4j-simple</artifactId>
29+
<version>1.7.25</version>
30+
<scope>compile</scope>
3031
</dependency>
32+
33+
<!-- <dependency>-->
34+
<!-- <groupId>log4j</groupId>-->
35+
<!-- <artifactId>log4j</artifactId>-->
36+
<!-- <version>1.2.17</version>-->
37+
<!-- </dependency>-->
3138
<dependency>
3239
<groupId>commons-lang</groupId>
3340
<artifactId>commons-lang</artifactId>
@@ -80,11 +87,11 @@
8087
<version>3.2.1</version>
8188
</dependency>
8289

83-
<dependency>
84-
<groupId>commons-logging</groupId>
85-
<artifactId>commons-logging</artifactId>
86-
<version>1.0.4</version>
87-
</dependency>
90+
<!-- <dependency>-->
91+
<!-- <groupId>commons-logging</groupId>-->
92+
<!-- <artifactId>commons-logging</artifactId>-->
93+
<!-- <version>1.0.4</version>-->
94+
<!-- </dependency>-->
8895

8996
<dependency>
9097
<groupId>net.sf.ezmorph</groupId>

‎src/main/java/com/database/HikariPoolManager.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44

55
import com.zaxxer.hikari.HikariDataSource;
6-
import org.apache.log4j.LogManager;
7-
import org.apache.log4j.Logger;
6+
import lombok.extern.slf4j.Slf4j;
87

98
import java.io.FileInputStream;
109
import java.sql.Connection;
@@ -18,9 +17,9 @@
1817
* @date 2017年8月9日18:46:41
1918
*
2019
*/
20+
@Slf4j
2121
public class HikariPoolManager {
22-
23-
static Logger logger= LogManager.getLogger(HikariPoolManager.class);
22+
2423

2524
//-- Hikari Datasource -->
2625
//driverClassName无需指定，除非系统无法自动识别
@@ -80,7 +79,7 @@ private static void readProperties(String propertitieFileName) {
8079

8180

8281
} catch (Exception e){
83-
logger.error("读取数据库参数出现问题："+e);
82+
log.error("读取数据库参数出现问题："+e);
8483
e.printStackTrace();
8584
}
8685
}
@@ -115,7 +114,7 @@ private static void dataSourceConfig(){
115114

116115

117116
}catch(Exception e){
118-
logger.error("设置datasource各个属性值异常!" + e);
117+
log.error("设置datasource各个属性值异常!" + e);
119118
e.printStackTrace();
120119
}
121120
}
@@ -132,7 +131,7 @@ public static Connection getConnection() throws Exception{
132131
try {
133132
connection = hikariDataSource.getConnection();
134133
} catch (Exception e) {
135-
logger.error("取得数据库连接时发生异常!"+ e);
134+
log.error("取得数据库连接时发生异常!"+ e);
136135
throw e;
137136
}
138137
return connection;
@@ -148,7 +147,7 @@ public static void freeConnection(Connection connection) throws Exception{
148147
try {
149148
connection.close();
150149
}catch(Exception e){
151-
logger.error("释放数据库连接时发生异常!"+ e.getMessage());
150+
log.error("释放数据库连接时发生异常!"+ e.getMessage());
152151
}
153152
}
154153
}

‎src/main/java/com/database/Mysql.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33

44

5-
import org.apache.log4j.Level;
6-
import org.apache.log4j.Logger;
5+
import lombok.extern.slf4j.Slf4j;
76

87
import java.sql.*;
98

9+
@Slf4j
1010
public class Mysql {
1111
private Connection conn;
1212
private Statement smt;
13-
private static Logger logger = Logger.getLogger(Mysql.class.getName());
1413

1514
static {
1615
try {
1716
Class.forName("com.mysql.jdbc.Driver").newInstance();
1817
} catch (Exception e) {
19-
logger.log(Level.ERROR, "Mysql:" + e.getMessage());
18+
log.error("Mysql error:", e);
2019
}
2120
}
2221

@@ -30,7 +29,7 @@ public ResultSet executeQuery(String sql) throws Exception {
3029
try {
3130
rs = smt.executeQuery(sql);
3231
} catch (SQLException e) {
33-
logger.log(Level.ERROR, sql+"\n" + e.getMessage());
32+
log.error("executeQuery error:", e);
3433
}
3534
return rs;
3635
}
@@ -62,7 +61,7 @@ public void executeUpdate(String sql) throws Exception {
6261
}catch(Exception e) {
6362
if(conn!=null) {
6463
conn.rollback();
65-
logger.debug("数据已存在或存在错误，开始回滚。");
64+
log.debug("数据已存在或存在错误，开始回滚。");
6665
}
6766
}
6867
}

‎src/main/java/com/database/MysqlTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
import com.bean.LocalUser;
44
import com.util.PropertyUtil;
5-
import org.apache.log4j.Logger;
5+
import lombok.extern.slf4j.Slf4j;
66
import java.sql.PreparedStatement;
77
import java.util.Properties;
88

9+
@Slf4j
910
public class MysqlTest {
1011
private static String url;
1112
private static String user;
1213
private static String password;
13-
private static Logger logger = Logger.getLogger(MysqlTest.class.getName());
14+
1415
// private static Properties prop = new Properties();
1516

1617

‎src/main/java/com/java8/completefuture/CompleteFutureDemo.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.java8.completefuture;
22

3-
import org.apache.log4j.LogManager;
4-
import org.apache.log4j.Logger;
3+
import lombok.extern.slf4j.Slf4j;
54

65
import java.util.concurrent.*;
76

87

8+
@Slf4j
99
public class CompleteFutureDemo {
1010

11-
private static Logger logger= LogManager.getLogger(CompleteFutureDemo.class);
11+
1212

1313
public static void main(String[] args) {
1414
supplyAsyncGet();
@@ -25,17 +25,17 @@ public static void supplyAsyncGet() {
2525
//获取返回值，2秒超时
2626
result = completableFuture.get(2, TimeUnit.SECONDS);
2727
} catch (Exception e) {
28-
logger.error("completableFuture.get error.", e);
28+
log.error("completableFuture.get error.", e);
2929
}
30-
logger.info("result:"+result);
30+
log.info("result:"+result);
3131
}
3232

3333
private static String runTask() {
3434
try {
3535
//任务耗时。可以分别设置1000和3000，看未超时和超时的不同结果。
3636
Thread.sleep(1000);
3737
} catch (InterruptedException e) {
38-
logger.error("supplyAsyncGet error.");
38+
log.error("supplyAsyncGet error.");
3939
}
4040
return "supplyAsyncGet";
4141
}

‎src/main/java/com/java8/completefuture/OfAllGetDemo.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package com.java8.completefuture;
22

3-
import org.apache.log4j.LogManager;
4-
import org.apache.log4j.Logger;
3+
4+
5+
import lombok.extern.slf4j.Slf4j;
56

67
import java.util.ArrayList;
78
import java.util.Collections;
89
import java.util.List;
910
import java.util.concurrent.*;
1011

12+
@Slf4j
1113
public class OfAllGetDemo {
1214

13-
private static Logger logger= LogManager.getLogger(OfAllGetDemo .class);
15+
1416

1517
public static void main(String[] args) {
1618
allOfGet();
@@ -35,7 +37,7 @@ public static void allOfGet() {
3537
}
3638
//触发异常
3739
if (throwable != null) {
38-
logger.error("completableFuture1 error:{}", throwable);
40+
log.error("completableFuture1 error:{}", throwable);
3941
}
4042
});
4143

@@ -46,7 +48,7 @@ public static void allOfGet() {
4648
resultList.add(result);
4749
}
4850
if (throwable != null) {
49-
logger.error("completableFuture2 error:{}", throwable);
51+
log.error("completableFuture2 error:{}", throwable);
5052
}
5153

5254
});
@@ -61,7 +63,7 @@ public static void allOfGet() {
6163
//将多个任务，汇总成一个任务，总共耗时不超时2秒
6264
CompletableFuture.allOf(futureArray).get(2, TimeUnit.SECONDS);
6365
} catch (Exception e) {
64-
logger.error("CompletableFuture.allOf Exception error.", e);
66+
log.error("CompletableFuture.allOf Exception error.", e);
6567
}
6668
List<String> list = new ArrayList<>(resultList);
6769

@@ -75,7 +77,7 @@ private static String runTask(String result, int millis) {
7577
//任务耗时。可以分别设置1000和3000，看未超时和超时的不同结果。
7678
Thread.sleep(millis);
7779
} catch (InterruptedException e) {
78-
logger.error("supplyAsyncGet error.");
80+
log.error("supplyAsyncGet error.");
7981
}
8082
return result;
8183
}

‎src/main/java/com/java8/completefuture/WhenCompleteDemo.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package com.java8.completefuture;
22

3-
import org.apache.log4j.LogManager;
4-
import org.apache.log4j.Logger;
3+
import lombok.extern.slf4j.Slf4j;
54

65
import java.util.ArrayList;
76
import java.util.Collections;
87
import java.util.List;
98
import java.util.concurrent.*;
109

10+
@Slf4j
1111
public class WhenCompleteDemo {
1212

1313

14-
private static Logger logger= LogManager.getLogger(WhenCompleteDemo.class);
1514

1615
public static void main(String[] args) {
1716
whenComplete();
@@ -28,15 +27,15 @@ public static void whenComplete() {
2827
() -> getResult(word1, 1000), executorService)
2928
.whenComplete((result, throwable) ->{
3029
if (throwable != null) {
31-
logger.error("completableFuture1 error:{}", throwable);
30+
log.error("completableFuture1 error:", throwable);
3231
}
3332
});
3433

3534
CompletableFuture<String> completableFuture2 = CompletableFuture.supplyAsync(
3635
() -> getResult(word2, 1500), executorService)
3736
.whenComplete((result, throwable) ->{
3837
if (throwable != null) {
39-
logger.error("completableFuture2 error:{}", throwable);
38+
log.error("completableFuture2 error:", throwable);
4039
}
4140
});
4241

@@ -63,7 +62,7 @@ private static String getResult(String result, int millis) {
6362
//任务耗时。可以分别设置1000和3000，看未超时和超时的不同结果。
6463
Thread.sleep(millis);
6564
} catch (InterruptedException e) {
66-
logger.error("supplyAsyncGet error.");
65+
log.error("supplyAsyncGet error.");
6766
}
6867
return result;
6968
}
@@ -74,11 +73,11 @@ private static String getFutureResult(CompletableFuture<String> completableFutur
7473
//获取返回值，2秒超时
7574
result = completableFuture.get(timeout, TimeUnit.SECONDS);
7675
} catch (InterruptedException e) {
77-
logger.error("InterruptedException error.", e);
76+
log.error("InterruptedException error.", e);
7877
} catch (ExecutionException e) {
79-
logger.error("ExecutionException error.", e);
78+
log.error("ExecutionException error.", e);
8079
} catch (TimeoutException e) {
81-
logger.error("TimeoutException error.", e);
80+
log.error("TimeoutException error.", e);
8281
}
8382
return result;
8483
}

‎src/main/java/com/json/JsonDemo.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ public static void jsonToObject(){
1515
String jsonString ="{\"name\":\"zhangsan\",\"password\":\"zhangsan123\",\"email\":\"10371443@qq.com\"}";
1616
JSONObject json = JSONObject.fromObject(jsonString);
1717
User user = new User();
18-
user.setName(json.getString("name"));
18+
String fullName = json.getString("name");
19+
int age = json.getInt("age");
20+
user.setName(fullName);
1921
user.setPassword(json.getString("password"));
2022
user.setEmail(json.getString("email"));
2123
System.out.println(user.toString());

‎src/main/java/com/log/ErrorLog.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.log;
2+
3+
import com.java8.completefuture.CompleteFutureDemo;
4+
import lombok.extern.slf4j.Slf4j;
5+
6+
import java.text.DateFormat;
7+
import java.text.ParseException;
8+
import java.text.SimpleDateFormat;
9+
import java.util.Date;
10+
11+
@Slf4j
12+
public class ErrorLog {
13+
14+
public static void main(String[] args) {
15+
String param = "xxx";
16+
SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
17+
try {
18+
Date date = simpleDateFormat.parse(param);
19+
} catch (Exception e) {
20+
//打印error日志时，最好能够把参数也打印出来，这样方便排查错误。
21+
log.error("parse error.str:{}", param, e);
22+
}
23+
}
24+
}

‎src/main/java/com/retry/RetryDemo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.retry;
22

33

4-
import org.apache.log4j.Logger;
4+
import lombok.extern.slf4j.Slf4j;
55

66
import java.util.Random;
77

@@ -11,8 +11,8 @@
1111
* 服务不稳定的时候，可以重试。
1212
*
1313
*/
14+
@Slf4j
1415
public class RetryDemo {
15-
private static final Logger log = Logger.getLogger(RetryDemo.class.getName());
1616

1717
public static void main(String[] args) throws InterruptedException {
1818
retryDoSomething();

0 commit comments

Comments
 (0)