diff --git a/.gitignore b/.gitignore index 6060515495e7f..8a341be9da820 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ _site Gemfile Gemfile.lock node_modules -package.json \ No newline at end of file +package.json +/.settings/ +/.project diff --git a/CNAME b/CNAME deleted file mode 100644 index 8b137891791fe..0000000000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ - diff --git a/_config.yml b/_config.yml index cdb46a3119c80..6db1ab35cc79f 100644 --- a/_config.yml +++ b/_config.yml @@ -3,13 +3,13 @@ # # Name of your site (displayed in the header) -name: Your Name +name: 佛陀(邵令) # Short bio or description (displayed in the header) -description: Web Developer from Somewhere +description: ------>>>> 程序猿 <<<<<------------- # URL of your avatar or profile pic (you could use your GitHub profile pic) -avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/jekyll-logo.png +avatar: http://www.infoq.com/resource/articles/netty-concurrent-programming-analysis/zh/smallimage/netty_100.png # # Flags below are optional @@ -18,15 +18,14 @@ avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/je # Includes an icon in the footer for each username you enter footer-links: dribbble: - email: + email: sshling@gmail.com + infoq:http://www.infoq.com/cn facebook: flickr: - github: barryclark/jekyll-now instagram: linkedin: pinterest: rss: # just type anything here for a working RSS icon, make sure you set the "url" above! - twitter: jekyllrb stackoverflow: # your stackoverflow profile, e.g. "users/50476/bart-kiers" # Your disqus shortname, entering this will enable commenting on posts diff --git a/_includes/analytics.html b/_includes/analytics.html index d8cdc0ec09cb5..5720eebf7c562 100644 --- a/_includes/analytics.html +++ b/_includes/analytics.html @@ -1,13 +1,3 @@ {% if site.google_analytics %} - - - + {% endif %} diff --git a/_posts/2014-3-3-Hello-World.md b/_posts/2014-3-3-Hello-World.md index c469524e3efa3..3b71094bf2782 100644 --- a/_posts/2014-3-3-Hello-World.md +++ b/_posts/2014-3-3-Hello-World.md @@ -1,10 +1,11 @@ --- layout: post -title: You're up and running! +title:博文目录 --- -Next you can update your site name, avatar and other options using the _config.yml file in the root of your repository (shown below :point_down:). + - java +importnew(http://www.importnew.com) -![_config.yml]({{ site.baseurl }}/images/config.png) -The easiest way to make your first post is to edit this one. Go into /_posts/ and update the Hello World markdown file. For more instructions head over to the [Jekyll Now repository](https://github.com/barryclark/jekyll-now) on GitHub. \ No newline at end of file + +-[github Pages和Jekyll入门](http://www.ruanyifeng.com/blog/2012/08/blogging_with_jekyll.html) diff --git a/_posts/2015-7-8-Nginx.md b/_posts/2015-7-8-Nginx.md new file mode 100644 index 0000000000000..204416c138b14 --- /dev/null +++ b/_posts/2015-7-8-Nginx.md @@ -0,0 +1,8 @@ +--- +layout: post +title:Nginx介绍 +--- + + +#刚刚开始 + Nginx介绍 \ No newline at end of file diff --git a/about.md b/about.md index db54e4dba16c6..aded99f398feb 100644 --- a/about.md +++ b/about.md @@ -1,15 +1,17 @@ --- layout: page -title: About +title: 关于我 permalink: /about/ --- -Some information about you! -### More Information -A place to include any other types of information that you'd like to include about yourself. +路途漫漫,继续努力 ... +
2006 十年光阴,一晃而过 -### Contact me +###更多关于我 -[email@domain.com](mailto:email@domain.com) \ No newline at end of file + +### 联系我 + +[sshling@gmail.com](mailto:sshling@gmail.com) diff --git a/index.html b/index.html index 0e3e137dded24..977e182cf5761 100644 --- a/index.html +++ b/index.html @@ -15,4 +15,4 @@

{{ post.title }}

Read More {% endfor %} - \ No newline at end of file + diff --git a/page/tec/index.htm b/page/tec/index.htm new file mode 100644 index 0000000000000..924e0f26aa627 --- /dev/null +++ b/page/tec/index.htm @@ -0,0 +1,30 @@ + + + + +首页 + + +关键字: + + +
segmentfault
+ + +
+ + + + \ No newline at end of file diff --git a/txt_note/20015.mm b/txt_note/20015.mm new file mode 100644 index 0000000000000..d4f53840b002d --- /dev/null +++ b/txt_note/20015.mm @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/txt_note/GP.txt b/txt_note/GP.txt new file mode 100644 index 0000000000000..d5d54f36ba9f9 --- /dev/null +++ b/txt_note/GP.txt @@ -0,0 +1,21 @@ +ᶨƷ֣ͶعɡϿҵ² + +Ҷ+ʣҵ4.0 ӯ +㣺֤500 +ִ + + + + + + + + + + + + + + + + diff --git "a/txt_note/IO\345\244\232\350\267\257\345\244\215\347\224\250.docx" "b/txt_note/IO\345\244\232\350\267\257\345\244\215\347\224\250.docx" new file mode 100644 index 0000000000000..3ea6550e59cfb Binary files /dev/null and "b/txt_note/IO\345\244\232\350\267\257\345\244\215\347\224\250.docx" differ diff --git a/txt_note/KO.mm b/txt_note/KO.mm new file mode 100644 index 0000000000000..5adde4d5e5b8e --- /dev/null +++ b/txt_note/KO.mm @@ -0,0 +1,4 @@ + + + + diff --git a/txt_note/MariaDB.txt b/txt_note/MariaDB.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/txt_note/wiz/01_nodelay_nopush_sendfile.lnk b/txt_note/wiz/01_nodelay_nopush_sendfile.lnk new file mode 100644 index 0000000000000..25394cef523bb Binary files /dev/null and b/txt_note/wiz/01_nodelay_nopush_sendfile.lnk differ diff --git "a/txt_note/wiz/02 tcp\344\270\211\346\254\241\346\217\241\346\211\213\343\200\220\351\235\236\345\207\241\351\207\215\347\202\271\343\200\221.lnk" "b/txt_note/wiz/02 tcp\344\270\211\346\254\241\346\217\241\346\211\213\343\200\220\351\235\236\345\207\241\351\207\215\347\202\271\343\200\221.lnk" new file mode 100644 index 0000000000000..c3b84e9b64fb6 Binary files /dev/null and "b/txt_note/wiz/02 tcp\344\270\211\346\254\241\346\217\241\346\211\213\343\200\220\351\235\236\345\207\241\351\207\215\347\202\271\343\200\221.lnk" differ diff --git "a/txt_note/wiz/CAS-SSO--\351\235\236\345\207\241.lnk" "b/txt_note/wiz/CAS-SSO--\351\235\236\345\207\241.lnk" new file mode 100644 index 0000000000000..ffe02280a0423 Binary files /dev/null and "b/txt_note/wiz/CAS-SSO--\351\235\236\345\207\241.lnk" differ diff --git "a/txt_note/wiz/IO\346\250\241\345\236\213.lnk" "b/txt_note/wiz/IO\346\250\241\345\236\213.lnk" new file mode 100644 index 0000000000000..3be226e65b125 Binary files /dev/null and "b/txt_note/wiz/IO\346\250\241\345\236\213.lnk" differ diff --git a/txt_note/wiz/sendfile.lnk b/txt_note/wiz/sendfile.lnk new file mode 100644 index 0000000000000..13bdca5bcf02d Binary files /dev/null and b/txt_note/wiz/sendfile.lnk differ diff --git "a/txt_note/wiz/shell-01-\345\237\272\347\241\200\345\233\236\351\241\276.lnk" "b/txt_note/wiz/shell-01-\345\237\272\347\241\200\345\233\236\351\241\276.lnk" new file mode 100644 index 0000000000000..f003ef3870dfa Binary files /dev/null and "b/txt_note/wiz/shell-01-\345\237\272\347\241\200\345\233\236\351\241\276.lnk" differ diff --git "a/txt_note/wiz/\343\200\220\351\235\236\345\207\2412015\343\200\221Nginx\350\265\204\346\226\231.lnk" "b/txt_note/wiz/\343\200\220\351\235\236\345\207\2412015\343\200\221Nginx\350\265\204\346\226\231.lnk" new file mode 100644 index 0000000000000..a843b30fda70b Binary files /dev/null and "b/txt_note/wiz/\343\200\220\351\235\236\345\207\2412015\343\200\221Nginx\350\265\204\346\226\231.lnk" differ diff --git "a/txt_note/wiz/\343\200\220\351\235\236\345\207\241\343\200\221\345\246\202\344\275\225\347\220\206\350\247\243js\345\274\202\346\255\245\344\272\213\344\273\266\347\274\226\347\250\213.lnk" "b/txt_note/wiz/\343\200\220\351\235\236\345\207\241\343\200\221\345\246\202\344\275\225\347\220\206\350\247\243js\345\274\202\346\255\245\344\272\213\344\273\266\347\274\226\347\250\213.lnk" new file mode 100644 index 0000000000000..1d19b9b7c6dec Binary files /dev/null and "b/txt_note/wiz/\343\200\220\351\235\236\345\207\241\343\200\221\345\246\202\344\275\225\347\220\206\350\247\243js\345\274\202\346\255\245\344\272\213\344\273\266\347\274\226\347\250\213.lnk" differ diff --git "a/txt_note/wiz/\345\276\205\347\234\213.lnk" "b/txt_note/wiz/\345\276\205\347\234\213.lnk" new file mode 100644 index 0000000000000..d8e0946c25012 Binary files /dev/null and "b/txt_note/wiz/\345\276\205\347\234\213.lnk" differ diff --git "a/txt_note/\345\210\206\345\270\203\345\274\217\347\274\223\345\255\230.txt" "b/txt_note/\345\210\206\345\270\203\345\274\217\347\274\223\345\255\230.txt" new file mode 100644 index 0000000000000..2027ca96256ac --- /dev/null +++ "b/txt_note/\345\210\206\345\270\203\345\274\217\347\274\223\345\255\230.txt" @@ -0,0 +1,32 @@ +Twemproxy Twitter开源的一个redis和memcache代理服务器。 + 缺点:静态的分布式Redis方案,扩缩容对运维要求高,很难平滑。 +Codis :尽量兼容Twemproxy,加上数据迁移的功能以实现扩缩容,最终替换Twemproxy。 +Redis Cluster :官方,与Codis同期发布。 + + + + + + + + + + + + + + + + + + + + + + + + + + + +