From 5b8e52ff69f338c9749ab871e1569e3292310f15 Mon Sep 17 00:00:00 2001 From: Chris Qi Date: Sun, 8 Nov 2020 15:42:29 +0000 Subject: [PATCH 1/3] Small content update --- docs/notes/Java 基础.md | 2 +- docs/notes/Java 并发.md | 1 + docs/notes/Linux.md | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/notes/Java 基础.md b/docs/notes/Java 基础.md index ec6bee09..f8797cbf 100644 --- a/docs/notes/Java 基础.md +++ b/docs/notes/Java 基础.md @@ -1429,7 +1429,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/docs/notes/Java 并发.md b/docs/notes/Java 并发.md index 9bdcbb8f..d4aad2d0 100644 --- a/docs/notes/Java 并发.md +++ b/docs/notes/Java 并发.md @@ -611,6 +611,7 @@ public static void main(String[] args) { WaitNotifyExample example = new WaitNotifyExample(); executorService.execute(() -> example.after()); executorService.execute(() -> example.before()); + executorService.shutdown(); } ``` diff --git a/docs/notes/Linux.md b/docs/notes/Linux.md index b94740e7..56e8220a 100644 --- a/docs/notes/Linux.md +++ b/docs/notes/Linux.md @@ -1075,6 +1075,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 ``` 可以根据字段的某些条件进行匹配，例如匹配字段小于某个值的那一行数据。 From 600256bde2721df27b1d3b0856cc8269dc70f8db Mon Sep 17 00:00:00 2001 From: Chris Qi Date: Wed, 18 Nov 2020 20:22:37 +0000 Subject: [PATCH 2/3] 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 ``` 可以根据字段的某些条件进行匹配，例如匹配字段小于某个值的那一行数据。 From 5ee7c7c750e9ecffaea12f97d5b05b2445e7c007 Mon Sep 17 00:00:00 2001 From: Chris Qi Date: Wed, 18 Nov 2020 20:24:58 +0000 Subject: [PATCH 3/3] Small content update --- notes/设计模式 - 备忘录.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notes/设计模式 - 备忘录.md b/notes/设计模式 - 备忘录.md index ca5e5967..c0f25dc7 100644 --- a/notes/设计模式 - 备忘录.md +++ b/notes/设计模式 - 备忘录.md @@ -8,7 +8,7 @@ - Originator：原始对象 - Caretaker：负责保存好备忘录 -- Memento：备忘录，存储原始对象的的状态。备忘录实际上有两个接口，一个是提供给 Caretaker 的窄接口：它只能将备忘录传递给其它对象；一个是提供给 Originator 的宽接口，允许它访问到先前状态所需的所有数据。理想情况是只允许 Originator 访问本备忘录的内部状态。 +- Memento：备忘录，存储原始对象的状态。备忘录实际上有两个接口，一个是提供给 Caretaker 的窄接口：它只能将备忘录传递给其它对象；一个是提供给 Originator 的宽接口，允许它访问到先前状态所需的所有数据。理想情况是只允许 Originator 访问本备忘录的内部状态。