Merge branch 'master' into ee_dev

README.md

@@ -62,13 +62,16 @@
 - [安装文档](https://www.yuque.com/u34495/mivcfg/qo4uqg)
     
 ## 项目案例
-
-- [查看](https://www.yuque.com/u34495/mivcfg/ep4otg)
+- [GitHub阅读器](https://github.com/wallace5303/find-github)
+    ![](https://kaka996.coding.net/p/resource/d/tx-resource/git/raw/master/img/github-reader/gr-home.png)
+- [更多项目](https://www.yuque.com/u34495/mivcfg/ep4otg)
 
 ## 交流
 1. qq群：735532437 (备注：ee框架)
-2. qq: 530353222
-3. 邮箱：530353222@qq.com
+2. 邮箱：530353222@qq.com
+
+## 程序员必备学习资料
+- [发现实用的GitHub项目](https://github.com/wallace5303/find-github)
 
 ## 关于pr
 请前往[GitHub项目](https://github.com/wallace5303/electron-egg)提pr（避免代码同步后，pr被覆盖掉），感谢！

public/dist/css/chunk-09cf4572.4ceda89c.css

@@ -0,0 +1 @@
+#app-base-socket-ipc[data-v-6f328a9e]{padding:0 10px;text-align:left;width:100%}#app-base-socket-ipc .one-block-1[data-v-6f328a9e]{font-size:16px;padding-top:10px}#app-base-socket-ipc .one-block-2[data-v-6f328a9e]{padding-top:10px}

public/dist/css/chunk-0ea3db16.80096fc0.css

@@ -0,0 +1 @@
+#app-base-httpserver[data-v-0e3f9564]{padding:0 10px;text-align:left;width:100%}#app-base-httpserver .one-block-1[data-v-0e3f9564]{font-size:16px;padding-top:10px}#app-base-httpserver .one-block-2[data-v-0e3f9564]{padding-top:10px}

public/dist/css/chunk-20541cc8.6df86df7.css

@@ -1 +0,0 @@
-#app-base-test-api[data-v-ebfedeb2]{padding:0 10px;text-align:left;width:100%}#app-base-test-api .one-block-1[data-v-ebfedeb2]{font-size:16px;padding-top:10px}#app-base-test-api .one-block-2[data-v-ebfedeb2]{padding-top:10px}

public/dist/css/chunk-28dca98c.d420421b.css

@@ -1 +0,0 @@
-#app-base-db[data-v-61b33b63]{padding:0 10px;text-align:left;width:100%}#app-base-db .one-block-1[data-v-61b33b63]{font-size:16px;padding-top:10px}#app-base-db .one-block-2[data-v-61b33b63]{padding-top:10px}

public/dist/css/chunk-2cd621d6.919e18c4.css

@@ -1 +0,0 @@
-#app-base-httpserver[data-v-10dff468]{padding:0 10px;text-align:left;width:100%}#app-base-httpserver .one-block-1[data-v-10dff468]{font-size:16px;padding-top:10px}#app-base-httpserver .one-block-2[data-v-10dff468]{padding-top:10px}

public/dist/css/chunk-34fd3e58.6c177387.css

@@ -1 +0,0 @@
-#app-base-system-launch[data-v-59a6529a]{padding:0 10px;text-align:left;width:100%}#app-base-system-launch .one-block-1[data-v-59a6529a]{font-size:16px;padding-top:10px}#app-base-system-launch .one-block-2[data-v-59a6529a]{padding-top:10px}#app-base-system-launch .set-auto .ant-list-item[data-v-59a6529a]:last-child{border-bottom:1px solid #e8e8e8}

public/dist/css/chunk-39d06403.6a07402f.css

@@ -0,0 +1 @@
+#app-base-system-launch[data-v-0e5fc119]{padding:0 10px;text-align:left;width:100%}#app-base-system-launch .one-block-1[data-v-0e5fc119]{font-size:16px;padding-top:10px}#app-base-system-launch .one-block-2[data-v-0e5fc119]{padding-top:10px}#app-base-system-launch .set-auto .ant-list-item[data-v-0e5fc119]:last-child{border-bottom:1px solid #e8e8e8}

public/dist/css/chunk-42cdec30.cc56886e.css

@@ -1 +0,0 @@
-#app-base-software-open[data-v-772e02b4]{padding:0 10px;text-align:left;width:100%}#app-base-software-open .one-block-1[data-v-772e02b4]{font-size:16px;padding-top:10px}#app-base-software-open .one-block-1 .sub-content[data-v-772e02b4]{font-size:14px}#app-base-software-open .one-block-2[data-v-772e02b4]{padding-top:10px}

public/dist/css/chunk-44e35807.4a06e18d.css

@@ -1 +0,0 @@
-#app-base-socket-ipc[data-v-66ef35a9]{padding:0 10px;text-align:left;width:100%}#app-base-socket-ipc .one-block-1[data-v-66ef35a9]{font-size:16px;padding-top:10px}#app-base-socket-ipc .one-block-2[data-v-66ef35a9]{padding-top:10px}

public/dist/css/chunk-46055e37.38f6334f.css

@@ -1 +0,0 @@
-#app-base-file[data-v-a9872e50]{padding:0 10px;text-align:left;width:100%}#app-base-file .one-block-1[data-v-a9872e50]{font-size:16px;padding-top:10px}#app-base-file .footer[data-v-a9872e50],#app-base-file .one-block-2[data-v-a9872e50]{padding-top:10px}

public/dist/css/chunk-4b52908d.2f12db76.css

@@ -0,0 +1 @@
+#app-base-screen[data-v-10809a44]{padding:0 10px;text-align:left;width:100%}#app-base-screen .one-block-1[data-v-10809a44]{font-size:16px;padding-top:10px}#app-base-screen .one-block-2[data-v-10809a44]{padding-top:10px}

public/dist/css/chunk-511d0abc.94e812c5.css

@@ -1 +0,0 @@
-#app-base-window-view[data-v-5946c2ed]{padding:0 10px;text-align:left;width:100%}#app-base-window-view .one-block-1[data-v-5946c2ed]{font-size:16px;padding-top:10px}#app-base-window-view .one-block-2[data-v-5946c2ed]{padding-top:10px}

public/dist/css/chunk-562eeec2.83845a9b.css

@@ -0,0 +1 @@
+#app-base-window-view[data-v-113436ad]{padding:0 10px;text-align:left;width:100%}#app-base-window-view .one-block-1[data-v-113436ad]{font-size:16px;padding-top:10px}#app-base-window-view .one-block-2[data-v-113436ad]{padding-top:10px}

public/dist/css/chunk-5ddca696.a4424700.css

@@ -1 +0,0 @@
-#app-base-screen[data-v-716fa21e]{padding:0 10px;text-align:left;width:100%}#app-base-screen .one-block-1[data-v-716fa21e]{font-size:16px;padding-top:10px}#app-base-screen .one-block-2[data-v-716fa21e]{padding-top:10px}

public/dist/css/chunk-681b6e7b.d3b5c327.css

@@ -0,0 +1 @@
+#app-base-window[data-v-674a2e67]{padding:0 10px;text-align:left;width:100%}#app-base-window .one-block-1[data-v-674a2e67]{font-size:16px;padding-top:10px}#app-base-window .one-block-2[data-v-674a2e67]{padding-top:10px}

public/dist/css/chunk-7a685cc9.4b14b6bb.css

@@ -1 +0,0 @@
-#app-demo-window[data-v-cae527a6]{padding:0 10px;text-align:left;width:100%}#app-demo-window .one-block-1[data-v-cae527a6]{font-size:16px;padding-top:10px}#app-demo-window .one-block-2[data-v-cae527a6]{padding-top:10px}

public/dist/css/chunk-854152fc.ffa3e4f4.css

@@ -1 +0,0 @@
-#app-base-screen[data-v-452151ab]{padding:0 10px;text-align:left;width:100%}#app-base-screen .one-block-1[data-v-452151ab]{font-size:16px;padding-top:10px}#app-base-screen .one-block-2[data-v-452151ab]{padding-top:10px}

public/dist/css/chunk-8d67a92e.e1e0247d.css

@@ -0,0 +1 @@
+#app-base-software-open[data-v-4de0eec0]{padding:0 10px;text-align:left;width:100%}#app-base-software-open .one-block-1[data-v-4de0eec0]{font-size:16px;padding-top:10px}#app-base-software-open .one-block-1 .sub-content[data-v-4de0eec0]{font-size:14px}#app-base-software-open .one-block-2[data-v-4de0eec0]{padding-top:10px}

public/dist/css/chunk-8e4edc1a.11e2850e.css

@@ -1 +0,0 @@
-#app-base-window[data-v-a421017e]{padding:0 10px;text-align:left;width:100%}#app-base-window .one-block-1[data-v-a421017e]{font-size:16px;padding-top:10px}#app-base-window .one-block-2[data-v-a421017e]{padding-top:10px}

public/dist/css/chunk-9d6d2b58.8536a744.css

@@ -0,0 +1 @@
+#app-base-db[data-v-4d4a1105]{padding:0 10px;text-align:left;width:100%}#app-base-db .one-block-1[data-v-4d4a1105]{font-size:16px;padding-top:10px}#app-base-db .one-block-2[data-v-4d4a1105]{padding-top:10px}

public/dist/css/chunk-c3583d28.ab0373ec.css

@@ -0,0 +1 @@
+#app-base-screen[data-v-c45f31c2]{padding:0 10px;text-align:left;width:100%}#app-base-screen .one-block-1[data-v-c45f31c2]{font-size:16px;padding-top:10px}#app-base-screen .one-block-2[data-v-c45f31c2]{padding-top:10px}

public/dist/css/chunk-ceb74d80.d635b2f3.css

@@ -0,0 +1 @@
+#app-base-test-api[data-v-35735581]{padding:0 10px;text-align:left;width:100%}#app-base-test-api .one-block-1[data-v-35735581]{font-size:16px;padding-top:10px}#app-base-test-api .one-block-2[data-v-35735581]{padding-top:10px}

public/dist/css/chunk-d83d034e.286494f0.css

@@ -0,0 +1 @@
+#app-demo-window[data-v-489510a6]{padding:0 10px;text-align:left;width:100%}#app-demo-window .one-block-1[data-v-489510a6]{font-size:16px;padding-top:10px}#app-demo-window .one-block-2[data-v-489510a6]{padding-top:10px}

public/dist/css/chunk-f135e6ae.72587d68.css

@@ -0,0 +1 @@
+#app-base-file[data-v-95d434e8]{padding:0 10px;text-align:left;width:100%}#app-base-file .one-block-1[data-v-95d434e8]{font-size:16px;padding-top:10px}#app-base-file .footer[data-v-95d434e8],#app-base-file .one-block-2[data-v-95d434e8]{padding-top:10px}

public/dist/js/chunk-3ce23730.e8c8980b.js → public/dist/js/chunk-3ce23730.c97b7cb7.js

@@ -1,2 +1,2 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3ce23730"],{1768:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{attrs:{id:"app-other"}},[e("div",{staticClass:"one-block-1"},[e("span",[t._v(" 待开发... ")])]),e("div",{staticClass:"one-block-2"})])}],i={data:function(){return{}},methods:{test:function(){}}},a=i,o=(e("fbed"),e("2877")),r=Object(o["a"])(a,c,s,!1,null,"7114d282",null);n["default"]=r.exports},f291:function(t,n,e){},fbed:function(t,n,e){"use strict";e("f291")}}]);
-//# sourceMappingURL=chunk-3ce23730.e8c8980b.js.map
+//# sourceMappingURL=chunk-3ce23730.c97b7cb7.js.map

update.md

@@ -1,3 +1,12 @@
+## 2.1.2
+1. ipc通信增加 invoke/handle 模型
+2. ipcRender增加 invoke异步/sendSync同步方法
+3. 优化ee-core代码
+4. 优化storage demo
+5. 优化ipc通信 同步、异步、双向通信demo
+6. 替换所有前端ipcCall为ipcInvoke
+7. 修复ipc并发请求问题
+
 ## 2.1.1
 1. 修复托盘窗口关闭问题
 2. 修复ee-core窗口事件