From 600256bde2721df27b1d3b0856cc8269dc70f8db Mon Sep 17 00:00:00 2001 From: Chris Qi Date: Wed, 18 Nov 2020 20:22:37 +0000 Subject: [PATCH] Small content update --- notes/Java 基础.md | 2 +- notes/Java 并发.md | 1 + notes/Linux.md | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/notes/Java 基础.md b/notes/Java 基础.md index 39cae44a..18ced0b3 100644 --- a/notes/Java 基础.md +++ b/notes/Java 基础.md @@ -1400,7 +1400,7 @@ public class Box { } ``` -- [Java 泛型详解](http://www.importnew.com/24029.html) +- [Java 泛型详解](https://www.cnblogs.com/Blue-Keroro/p/8875898.html) - [10 道 Java 泛型面试题](https://cloud.tencent.com/developer/article/1033693) ## 十、注解 diff --git a/notes/Java 并发.md b/notes/Java 并发.md index cb011950..a94847d5 100644 --- a/notes/Java 并发.md +++ b/notes/Java 并发.md @@ -613,6 +613,7 @@ public static void main(String[] args) { WaitNotifyExample example = new WaitNotifyExample(); executorService.execute(() -> example.after()); executorService.execute(() -> example.before()); + executorService.shutdown(); } ``` diff --git a/notes/Linux.md b/notes/Linux.md index c31cccc9..c11905d2 100644 --- a/notes/Linux.md +++ b/notes/Linux.md @@ -1077,6 +1077,11 @@ dmtsai tty1 Fri May 29 11:55 - 12:11 (00:15) ```html $ last -n 5 | awk '{print $1 "\t" $3}' +dmtsai 192.168.1.100 +dmtsai 192.168.1.100 +dmtsai 192.168.1.100 +dmtsai 192.168.1.100 +dmtsai Fri ``` 可以根据字段的某些条件进行匹配,例如匹配字段小于某个值的那一行数据。