感觉今天状态不佳啊，明天继续加油！

frank-lam · frank-lam · commit baa09857cb4a · 2018-07-29T22:59:35.000+08:00
diff --git a/notes/JavaArchitecture/04 Java IO.md b/notes/JavaArchitecture/04 Java IO.md
@@ -536,10 +536,16 @@ public static void main(String[] args) throws IOException
 - Socket&#65306;&#23458;&#25143;&#31471;&#31867;
 - &#26381;&#21153;&#22120;&#21644;&#23458;&#25143;&#31471;&#36890;&#36807; InputStream &#21644; OutputStream &#36827;&#34892;&#36755;&#20837;&#36755;&#20986;&#12290;
 
+
+
 ![](https://raw.githubusercontent.com/CyC2018/Interview-Notebook/033676724523021872edb86176e92a87b87acd46/pics/ClienteServidorSockets1521731145260.jpg)
 
  
 
+&#21442;&#32771;&#36164;&#26009;&#65306;
+
+- [&#20351;&#29992;TCP/IP&#30340;&#22871;&#25509;&#23383;&#65288;Socket&#65289;&#36827;&#34892;&#36890;&#20449; - alps_01 - &#21338;&#23458;&#22253;](https://www.cnblogs.com/alps/p/5672757.html)
+
 
 
 ### Datagram
diff --git a/notes/JavaArchitecture/07 Java Web.md b/notes/JavaArchitecture/07 Java Web.md
@@ -67,6 +67,7 @@
 - Spring
 - Strust2
 - Hibernate
+- Mybatis
 - Spring MVC
 - Spring Boot
 - Dubbo
@@ -76,16 +77,13 @@
 > &#22312;&#38754;&#35797;&#25351;&#21335;&#20013;&#23558;&#32599;&#21015;&#38754;&#35797;&#20013;&#24120;&#35265;&#30340;&#32771;&#28857;&#65292;&#21253;&#21547;Servlet&#12289;JSP&#12289;Spring&#12289;&#20013;&#38388;&#20214;&#31561;&#24120;&#32771;Java Web&#26694;&#26550;&#30693;&#35782;
 >
 
-[Spring &#24120;&#35265;&#30340;&#19968;&#20123;&#38754;&#35797;&#39064;&#25972;&#29702; &#25628;&#20113;&#24211;](https://www.souyunku.com/2018/03/21/spring/)
+
 
 
 # &#19968;&#12289;Servlet & JSP
 
 ## 1. Servlet&#25191;&#34892;&#27969;&#31243;
 
-JavaWeb&#65288;&#19968;&#65289;Servlet&#20013;&#30340;ServletConfig&#19982;ServletContext - &#33510;&#27700;&#28070;&#21897; - &#21338;&#23458;&#22253;
-http://www.cnblogs.com/zhangyinhua/p/7629099.html
-
 
 
 JavaWeb&#65288;&#19968;&#65289;&#20043;&#32454;&#35828;Servlet - &#33510;&#27700;&#28070;&#21897; - &#21338;&#23458;&#22253;
@@ -381,6 +379,13 @@ AOP&#65288;Aspect Oriented Programming &#65289;&#31216;&#20026;&#38754;&#21521;&#20999;&#38754;&#32534;&#31243;&#65292;&#25193;&#23637;&#21151;&#33021;&#19981;
 
 
 
+Struts2&#25318;&#25130;&#22120;&#27973;&#26512;-&#24917;&#35838;&#32593;
+https://www.imooc.com/learn/450
+
+
+
+
+
 
 
 ## 7. Spring &#26159;&#22914;&#20309;&#31649;&#29702;&#20107;&#21153;&#30340;&#65292;&#20107;&#21153;&#31649;&#29702;&#26426;&#21046;
@@ -908,6 +913,7 @@ Spring MVC&#30340;&#24037;&#20316;&#21407;&#29702;&#22914;&#19979;&#22270;&#25152;&#31034;&#65306;&#8239;
 
 - [Java-Guide/Spring&#23398;&#20064;&#19982;&#38754;&#35797;.md at master &middot; Snailclimb/Java-Guide](https://github.com/Snailclimb/Java-Guide/blob/master/%E4%B8%BB%E6%B5%81%E6%A1%86%E6%9E%B6/Spring%E5%AD%A6%E4%B9%A0%E4%B8%8E%E9%9D%A2%E8%AF%95.md)
 - [biezhi/java-bible: &#25105;&#30340;&#25216;&#26415;&#25688;&#35201;](https://github.com/biezhi/java-bible)
+- [Spring &#24120;&#35265;&#30340;&#19968;&#20123;&#38754;&#35797;&#39064;&#25972;&#29702; &#25628;&#20113;&#24211;](https://www.souyunku.com/2018/03/21/spring/)
 
 &#21442;&#32771;&#38754;&#32463;&#65306;
 
diff --git a/notes/JavaArchitecture/Socket.md b/notes/JavaArchitecture/Socket.md
diff --git a/notes/JavaWeb/Spring.md b/notes/JavaWeb/Spring.md
@@ -68,6 +68,8 @@
 - [Spring IoC&#26377;&#20160;&#20040;&#22909;&#22788;&#21602;&#65311; - &#30693;&#20046;](https://www.zhihu.com/question/23277575/answer/169698662)
 - [&#26497;&#23458;&#23398;&#38498;Spring Wiki](http://wiki.jikexueyuan.com/project/spring/transaction-management.html) 
 - [&#12304;&#24517;&#35835;&#12305;Spring W3Cschool&#25945;&#31243;](https://www.w3cschool.cn/wkspring/f6pk1ic8.html) 
+- [&#12304;&#24517;&#35835;&#12305;Java&#26032;&#25163;&#22914;&#20309;&#23398;&#20064;Spring&#12289;Struts&#12289;Hibernate&#19977;&#22823;&#26694;&#26550;&#65311; - &#30693;&#20046;&#65292;&#28145;&#24230;&#22909;&#25991;](https://www.zhihu.com/question/21142149)
+  
 
 
 
diff --git a/notes/Socket.md b/notes/Socket.md
@@ -0,0 +1,15 @@
+&#39640;&#24182;&#21457;&#32593;&#32476;&#32534;&#31243;&#20043;epoll&#35814;&#35299; - CSDN&#21338;&#23458;
+https://blog.csdn.net/shenya1314/article/details/73691088
+
+
+
+
+
+## RMI
+
+&#22312;RMI&#20013;&#36890;&#36807;&#20195;&#29702;&#27169;&#24335;&#23454;&#29616;
+
+
+
+## RPC
+
diff --git a/plan/201807.md b/plan/201807.md
@@ -26,7 +26,6 @@
   - [x] &#36845;&#20195;&#22120;&#27169;&#24335; 7.16
   - [ ] &#20195;&#29702;&#27169;&#24335;&#65288;AOP&#20013;&#65289;| &#20026;&#19968;&#20010;&#23545;&#35937;&#25552;&#20379;&#19968;&#20010;&#26367;&#36523;&#65292;&#20197;&#25511;&#21046;&#36825;&#20010;&#23545;&#35937;&#30340;&#35775;&#38382;
 
-  
 - &#12298;Java&#24182;&#21457;&#32534;&#31243;&#23454;&#25112;&#12299;
 - &#12298;&#28145;&#20837;&#29702;&#35299;Java&#34394;&#25311;&#26426;&#12299;
 - &#24182;&#21457;&#23481;&#22120;

-Original file line number
+Diff line change
 - Socket：客户端类
 - 服务器和客户端通过 InputStream 和 OutputStream 进行输入输出。
++
++
 ![](https://raw.githubusercontent.com/CyC2018/Interview-Notebook/033676724523021872edb86176e92a87b87acd46/pics/ClienteServidorSockets1521731145260.jpg)
 +参考资料：
++
 +- [使用TCP/IP的套接字（Socket）进行通信 - alps_01 - 博客园](https://www.cnblogs.com/alps/p/5672757.html)
++
 ### Datagram
-Original file line number
+Diff line change
 - Spring
 - Strust2
 - Hibernate
 +- Mybatis
 - Spring MVC
 - Spring Boot
 - Dubbo
 > 在面试指南中将罗列面试中常见的考点，包含Servlet、JSP、Spring、中间件等常考Java Web框架知识
+>
 -[Spring 常见的一些面试题整理 搜云库](https://www.souyunku.com/2018/03/21/spring/)
++
 # 一、Servlet & JSP
 ## 1. Servlet执行流程
 -JavaWeb（一）Servlet中的ServletConfig与ServletContext - 苦水润喉 - 博客园
 -http://www.cnblogs.com/zhangyinhua/p/7629099.html
+-
 JavaWeb（一）之细说Servlet - 苦水润喉 - 博客园
 +Struts2拦截器浅析-慕课网
 +https://www.imooc.com/learn/450
++
++
++
++
++
 ## 7. Spring 是如何管理事务的，事务管理机制
 - [Java-Guide/Spring学习与面试.md at master · Snailclimb/Java-Guide](https://github.com/Snailclimb/Java-Guide/blob/master/%E4%B8%BB%E6%B5%81%E6%A1%86%E6%9E%B6/Spring%E5%AD%A6%E4%B9%A0%E4%B8%8E%E9%9D%A2%E8%AF%95.md)
 - [biezhi/java-bible: 我的技术摘要](https://github.com/biezhi/java-bible)
 +- [Spring 常见的一些面试题整理 搜云库](https://www.souyunku.com/2018/03/21/spring/)
 参考面经：
-Original file line number
+Diff line change
 - [Spring IoC有什么好处呢？ - 知乎](https://www.zhihu.com/question/23277575/answer/169698662)
 - [极客学院Spring Wiki](http://wiki.jikexueyuan.com/project/spring/transaction-management.html)
 - [【必读】Spring W3Cschool教程](https://www.w3cschool.cn/wkspring/f6pk1ic8.html)
 +- [【必读】Java新手如何学习Spring、Struts、Hibernate三大框架？ - 知乎，深度好文](https://www.zhihu.com/question/21142149)
++
-Original file line number
+Diff line change
   - [x] 迭代器模式 7.16
   - [ ] 代理模式（AOP中）| 为一个对象提供一个替身，以控制这个对象的访问
+-
 - 《Java并发编程实战》
 - 《深入理解Java虚拟机》
 - 并发容器