Skip to content

Commit 1a473b4

Browse files
authored
Merge pull request CyC2018#4 from CyC2018/master
update
2 parents 357ad42 + 756f1d8 commit 1a473b4

File tree

8 files changed

+1379
-1089
lines changed

8 files changed

+1379
-1089
lines changed

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
|||||||||||
33
| :--------: | :---------: | :---------: | :---------: | :---------: | :---------:| :---------: | :-------: | :-------:| :------:|
44
| 算法[:pencil2:](#算法-pencil2) | 操作系统[:computer:](#操作系统-computer)|网络[:cloud:](#网络-cloud) | 面向对象[:couple:](#面向对象-couple) |数据库[:floppy_disk:](#数据库-floppy_disk)| Java [:coffee:](#java-coffee)| 分布式[:sweat_drops:](#分布式-sweat_drops)| 工具[:hammer:](#工具-hammer)| 编码实践[:speak_no_evil:](#编码实践-speak_no_evil)| 后记[:memo:](#后记-memo) |
5-
</br>
6-
7-
:loudspeaker: 本仓库不参与商业行为,不向读者收取任何费用。
85

9-
:loudspeaker: This repository is not engaging in business activities, and does not charge readers any fee.
10-
</br></br>
6+
本仓库不参与商业行为,不向读者收取任何费用。(This repository is not engaging in business activities, and does not charge readers any fee.)
7+
</br>
118

129
## 算法 :pencil2:
1310

notes/HTTP.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363

6464
## Web 基础
6565

66-
- HTTP(HyperText Transfer Protocol,超文本传输协议)
67-
- WWW(World Wide Web)的三种技术:HTML、HTTP、URL
66+
- HTTP(HyperText Transfer Protocol,超文本传输协议)
67+
- WWW(World Wide Web)的三种技术:HTML、HTTP、URL
6868
- RFC(Request for Comments,征求修正意见书),互联网的设计文档。
6969

7070
## URL
7171

7272
- URI(Uniform Resource Indentifier,统一资源标识符)
7373
- URL(Uniform Resource Locator,统一资源定位符)
74-
- URN(Uniform Resource Name,统一资源名称),例如 urn:isbn:0-486-27557-4
74+
- URN(Uniform Resource Name,统一资源名称),例如 urn:isbn:0-486-27557-4。
7575

7676
URI 包含 URL 和 URN,目前 WEB 只有 URL 比较流行,所以见到的基本都是 URL。
7777

notes/Java 并发.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,6 @@ run..run..run..run..run..run..run..run..run..run..end
747747

748748
```java
749749
public class CyclicBarrierExample {
750-
751750
public static void main(String[] args) throws InterruptedException {
752751
final int totalThread = 10;
753752
CyclicBarrier cyclicBarrier = new CyclicBarrier(totalThread);

0 commit comments

Comments
 (0)