diff --git a/BMap_Btrace_note.md b/BMap_Btrace_note.md
new file mode 100644
index 0000000..81e1575
--- /dev/null
+++ b/BMap_Btrace_note.md
@@ -0,0 +1,22 @@
+#key
+http://lbsyun.baidu.com/apiconsole/key
+
+#BaiduTrace
+http://lbsyun.baidu.com/index.php?title=yingyan/manage
+
+#demo
+http://lbsyun.baidu.com/index.php?title=ios-yingyan/sdkandev-download
+
+main.c
+```
+//全局变量
+int const serviceId = 123444; //此处填写在鹰眼管理后台创建的服务的ID
+NSString *const AK = @"fqw667wRwVvKM3MFTsqn4bPewN1VwooR";//此处填写您在API控制台申请得到的ak，该ak必须为iOS类型的ak
+NSString *const MCODE = @"YingYanSDKDemo";//此处填写您申请iOS类型ak时填写的安全码
+double const EPSILON = 0.0001;
+
+```
+
+#tips_blog
+http://bbs.lbsyun.baidu.com/forum.php?mod=viewthread&tid=106654&extra=page%3D1
+
diff --git a/BMap_sport_trace_note.md b/BMap_sport_trace_note.md
new file mode 100644
index 0000000..56f05ce
--- /dev/null
+++ b/BMap_sport_trace_note.md
@@ -0,0 +1,6 @@
+#ios_map_sdk
+baidu : 
+http://lbsyun.baidu.com/index.php?title=iossdk/sdkiosdev-download
+
+#demo
+https://github.com/orchan/BDTrackDemo/tree/alphaBranch
diff --git a/README.md b/README.md
index 00a0329..236b08a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-###学习笔记
+### 学习笔记
 既然不能做到过目不忘，索性把看到的记下来，做笔记的好处就是下次碰到问题时直接查看经过自己总结的笔记有事半功倍的效果，因此也养成了学习一点就记一点的习惯。以前喜欢用Evernote来记录，现在用GitHub。  
 
-####Python
+#### Python
 5. [collections学习笔记](./note/python/collections.md)
 5. [函数式编程------序列处理函数](./note/python/function_programming_of_function_processing_functions.md)
 6. [协程](./note/python/coroutine.md)
@@ -18,7 +18,7 @@
 20. [理解WSGI](./note/python/wsgi.md)
 21. [Flask之Hello world详解](./note/python/flask.md)
 
-#####Django
+##### Django
 1. [Django测试指南](./note/python/a_guide_to_testing_in_django.md)
 2. [Django模版语言](./note/python/django_template.md)
 3. [使用django-simple-captcha遇到的坑](./note/python/captcha.md)
@@ -28,14 +28,14 @@
 10. [Django signal](./note/python/signals.md)
 
 
-#####Mako模板
+##### Mako模板
 
 5. [mako简介](./note/python/mako.md)
 
-#####SQLAlchemy
+##### SQLAlchemy
 14. [SQLAlchemy学习笔记](./note/python/sqlalchemy.md)
 
-####Java
+#### Java
 此系列文章绝大部分发布在[importnew.com](http://www.importnew.com)网站上  
 
 1. [JDBC批处理Select语句](./note/java/JDBC Performance Tips.md)
@@ -45,7 +45,7 @@
 5. [范行实践](./note/java/Generic.md)
 6. [类加载与初始化](./note/java/classloading and initialization.md)
 
-####Vim
+#### Vim
 [Vim相关文章](./note/vim/目录.md)，早期写的一些文章可以在我的旧博客：[liuzhijun.iteye.com](http://liuzhijun.iteye.com/category/270228)查看到  
 
 10. [正则表达式](./note/vim/10.md) 
@@ -69,22 +69,20 @@
 28. [Vim28 全局命令](./note/vim/28.md)
 [我的vim配置](./note/vim/vimrc.md)  
 
-####memcached
+#### memcached
 1. [入门安装篇](./note/memcached/introduce_install.md)  
 2. [命令介绍篇](./note/memcached/telnet_command.md)
 
-####redis
+#### redis
 1. [入门篇](./note/redis/introduce.md)
 
-####RQ
+#### RQ
 1. [RQ简介](./note/rq/rq_getting_start.md)
 2. [RQ Queue](./note/rq/rq.md)
 3. [RQ Worker](./note/rq/rq_worker.md)
 
 
-####sphinx/coreseek
+#### sphinx/coreseek
 1. [sphinx笔记](./note/python/sphinx/introduce.md)  
 
-不定时更新 
-
 
diff --git a/Um_Sina_devlop.md b/Um_Sina_devlop.md
new file mode 100644
index 0000000..e78696b
--- /dev/null
+++ b/Um_Sina_devlop.md
@@ -0,0 +1,3 @@
+#Sina API (http://open.weibo.com/wiki/%E5%BE%AE%E5%8D%9AAPI#.E5.BE.AE.E5.8D.9A)
+
+#UM (http://dev.umeng.com/social/ios/quick-integration#3_1)
diff --git a/android_adb.md b/android_adb.md
new file mode 100644
index 0000000..7ecef52
--- /dev/null
+++ b/android_adb.md
@@ -0,0 +1,18 @@
+#adb
+
+>* path : Android_sdk
+
+>* adb logcat -c
+>* adb logcat -s tag,tag2,tag3
+
+#ndk
+>* nkd-build 
+>* nkd-build clean
+
+#inet c
+```
+   char addr_tmp[INET_ADDRSTRLEN];
+                inet_ntop(AF_INET, &(peeraddr.sin_addr), addr_tmp, INET_ADDRSTRLEN);
+                LOGI("==> accept client %s:%d by socket %d\n",
+                          addr_tmp, ntohs(peeraddr.sin_port), conn);
+```
diff --git a/class_intrduction.md b/class_intrduction.md
new file mode 100644
index 0000000..f4ddc88
--- /dev/null
+++ b/class_intrduction.md
@@ -0,0 +1,20 @@
+# python class 
+## python staticmethod
+静态方法和一般的函数十分相似，都不可访问class内部的变量和init里头的实例变量
+
+  
+## python classmethod
+类方法把一个类作为第一个接受的函数值，可以访问class内部的变量但不能访问实例变量
+
+普通方法(simple)类方法(classmethod)静态方法(staticmethod)的区别只需要抓住这一点他们都写在class类内.``` 
+class A(object):  
+def f(self, x):
+  pass  
+@classmethod  
+def f(cls, x): 
+  pass 
+@staticmethod 
+def f(x): 
+  passa = A()
+```
+所以他们唯一的区别是函数的第一个参数绑定的对象不一样:普通方法(simple) def f(self, x): 的第一个参数 self 绑定的对象是实例对象 a, 第二个参数是 x ;类方法(classmethod) def f(cls, x): 的第一个参数 cls 绑定的对象是类 A , 第二个参数是 x ;静态方法(staticmethod) def f(x): 的第一个参数就是传参 x 自己.
diff --git a/cocoapod_thing.md b/cocoapod_thing.md
new file mode 100644
index 0000000..59b28dd
--- /dev/null
+++ b/cocoapod_thing.md
@@ -0,0 +1,192 @@
+#ques : 
+如何下载和安装CocoaPods? 
+在本地安装好Ruby环境
+
+OS X系统默认可以运行Ruby,运行sudo gem update --system 升级Ruby，
+
+移除现有Ruby默认源
+
+$ gem sources --remove https://rubygems.org/
+
+//等有反应之后再敲入以下命令
+
+$ gem sources -a https://ruby.taobao.org/
+
+验证新源是否替换成功
+
+$gem sources -l
+
+#cocoapods
+cocoapods
+
+这时候,你再次在终端中运行:
+
+$ sudo gem install cocoapods
+
+苹果系统升级OS X EL Capitan 后安装改为:
+
+$ sudo gem install -n /usr/local/bin cocoapods
+
+等上一会,CocoaPods就可以在你本地下载并且安装好了,不再需要其他设置。
+
+然后$ pod setup
+
+等上一大会，Setting up CocoaPods master repo结束，就可以使用了。。。
+
+使用CocoaPods
+
+使用CocoPods和安装它一样简单,也是通过一两行命令就可以搞定。
+
+小编在这里用两种使用场景来具体说明如何使用CocoaPods。
+
+们可以尝试搜索一个第三方类库：
+
+pod search AFNetworking
+
+#pod libs
+(cd命令)你项目所在目录,然后在当前目录下,利用vim创建Podfile,运行:
+
+$ vim Podfile
+
+然后在Podfile文件中输入以下文字:
+
+platform :ios, '7.0'
+
+pod "AFNetworking", "~> 2.0"
+
+-------------------------------------
+
+```
+target 'MyApp' do
+  pod 'AFNetworking', '~> 3.0'
+  pod 'FBSDKCoreKit', '~> 4.9'
+end
+```
+
+当前AFNetworking支持的iOS最高版本是iOS 7.0,要下载的AFNetworking版本是2.0。
+
+关于Podfile文件编辑时，第三方库版本号的各种写法：
+
+pod ‘AFNetworking’ //不显式指定依赖库版本，表示每次都获取最新版本
+pod ‘AFNetworking’,‘2.0’ //只使用2.0版本
+pod ‘AFNetworking’, ‘>2.0′ //使用高于2.0的版本
+pod ‘AFNetworking’, ‘>=2.0′ //使用大于或等于2.0的版本
+pod ‘AFNetworking’, ‘<2.0′ //使用小于2.0的版本
+pod ‘AFNetworking’, ‘<=2.0′ //使用小于或等于2.0的版本
+pod ‘AFNetworking’, ‘~>0.1.2′ //使用大于等于0.1.2但小于0.2的版本，相当于>=0.1.2并且<0.2.0
+pod ‘AFNetworking’, ‘~>0.1′ //使用大于等于0.1但小于1.0的版本
+pod ‘AFNetworking’, ‘~>0′ //高于0的版本，写这个限制和什么都不写是一个效果，都表示使用最新版本 
+然后保存退出。vim环境下,保存退出命令是:
+
+:wq
+
+小提示：（终端vim/vi文件 按 i 可编辑 ，esc 退出编辑，：wq 或者ZZ 可保存退出）
+
+这时候,你会发现你的项目目录中,出现一个名字为Podfile的文件,
+
+而且文件内容就是你刚刚输入的内容。注意,Podfile文件应该和你
+
+的工程文件.xcodeproj在同一个目录下。
+
+这时候,你就可以利用CocoPods下载AFNetworking类库了。还是
+
+在终端中的当前项目目录下,运行以下命令:
+
+$ pod install
+
+
+(如果在pod install、或者pod update时，不想升级specs库，可以增加忽略参数
+
+pod install --no-repo-update
+
+pod update --no-repo-update)
+
+因为是在你的项目中导入AFNetworking,这就是为什么这个命令需
+
+要你进入你的项目所在目录中运行。
+
+运行上述命令之后,小编的终端出现以下信息:
+
+[i] From now on use ‘cocoaPodsDemo.xcworkspace’
+
+注意最后一句话,意思是:以后打开项目就用CocoaPodsDemo.xcworkspace打开,而不是之前的.xcodeproj文件。
+
+##注意
+```
+注意,这里有个小问题,如果刚刚你不是输入$ pod update,而是输入$ pod install,会发现类库导入不成功,并且终端出现下面
+
+提示:
+
+[!] Required version (UAAppReviewManager (from `../`)) notfound for `UAAppReviewManager`.
+
+Available versions: 0.1.6这里的意思大概是Podfile文件过期,类库有升级,但是Podfile没有
+
+更改。$ pod install只会按照Podfile的要求来请求类库,如果类
+
+库版本号有变化,那么将获取失败。但是$ pod update会更新所有
+
+的类库,获取最新版本的类库。而且你会发现,如果用了$ pod
+
+update,再用$ pod install就成功了。
+
+那你也许会问,什么时候用$ pod install,什么时候用$ pod
+
+update呢,我又不知道类库有没有新版本。好吧,那你每次直接用$ pod update算了。或者先用$ pod install,如果不行,再用$
+
+pod update。
+
+终端 cocoapods 下载bug调试：
+
+错误1：
+
+Error fetching http://ruby.taobao.org/:
+
+bad response Not Found 404 (http://ruby.taobao.org/specs.4.8.gz)
+
+解决方案：把安装流程中 $gem sources -a http://ruby.taobao.org/---改为----> $gem sources -a https://ruby.taobao.org/
+
+错误2：
+
+ERROR: While executing gem ... (Errno::EPERM)
+
+Operation not permitted - /usr/bin/pod
+
+解决方案：苹果系统升级OS X EL Capitan后会出现的插件错误，将安装流程 4.安装CocoaPods 的 (1)sudo gem install cocoapods ——>改为sudo gem install -n /usr/local/bin cocoapods
+
+错误3：
+
+[!] Unable to satisfy the following requirements: - `AVOSCloud (~> 3.1.6.3)` required by `Podfile`
+
+Specs satisfying the `AVOSCloud (~> 3.1.6.3)` dependency were found, but they required a higher minimum deployment target.
+
+解决方案：安装流程：Podfile文件 中 platform:ios,‘6.0’后边的 6.0 是平台版本号 ，一定要加上
+
+其他解决不了的
+
+解决方案：
+
+$ sudo rm -rf ~/.cocoapods/repos/master
+
+$ pod setup
+
+```
+
+from :
+http://www.th7.cn/Program/Ruby/201606/869773.shtml
+
+
+# 强迫使用，暴力解决
+
+```
+$ mkdir -p $HOME/Software/ruby
+$ export GEM_HOME=$HOME/Software/ruby
+$ gem install cocoapods
+[...]
+1 gem installed
+$ export PATH=$PATH:$HOME/Software/ruby/bin
+$ pod --version
+0.37.2
+```
+ 
+
+
diff --git a/develop_ble.md b/develop_ble.md
new file mode 100644
index 0000000..c0eeec9
--- /dev/null
+++ b/develop_ble.md
@@ -0,0 +1,11 @@
+#introduce JLBLEctrl
+>* 1 swift2.2
+>* 2 xcode 7.3.1
+>* 3 third party: babybluetooth 
+>* 4 demo third party: audioplayer,prettyruler,SVDH etc
+>* 5 oc and swift
+>* 6 Localizabl.string(Base,English,Simplified)
+>* 7 custom ui for obsoulety,storyboard
+>* 8 
+
+#first step
diff --git a/develop_wechat.md b/develop_wechat.md
new file mode 100644
index 0000000..af91ede
--- /dev/null
+++ b/develop_wechat.md
@@ -0,0 +1,12 @@
+###wechat
+
+[wechat info](https://open.weixin.qq.com/cgi-bin/frame?t=home/app_tmpl&lang=zh_CN)
+
+[OAuth 2.0 Swift](https://github.com/OAuthSwift/OAuthSwift)
+
+[prepare]9https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=1417694084&token=e571d84f8ceec401d7be6be904177e7b4a0a8700&lang=zh_CN)
+
+[login](https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419317851&token=e571d84f8ceec401d7be6be904177e7b4a0a8700&lang=zh_CN)
+
+
+[share](https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419317332&token=e571d84f8ceec401d7be6be904177e7b4a0a8700&lang=zh_CN)
diff --git a/dict_note b/dict_note
new file mode 100644
index 0000000..04330ba
--- /dev/null
+++ b/dict_note
@@ -0,0 +1,3 @@
+使用dict.fromkeys(range(100),[])初始化时 用append改编其中一个值其他的值也跟着改变 ————所以元素的地址全都指向一个[]
+避免这种错误的方法 使用推导式初始化———— {k:[] for k in range(100)}
+
diff --git a/ios_bridging_header.md b/ios_bridging_header.md
new file mode 100644
index 0000000..55bd501
--- /dev/null
+++ b/ios_bridging_header.md
@@ -0,0 +1,7 @@
+## Bridging-Header.h
+
+1.项目名-Bridging-Header.h 的桥接文件
+
+2、配置头文件：去BuildSettings --> Swift Compiler-Code Generation --> Objective-C Bridging Header 中设置桥接文件的路径：
+
+3、在需要使用的swift文件中可以 **直接用swift语言** 的方式调用oc文件及其方法、属性
diff --git a/meituan_note.md b/meituan_note.md
new file mode 100644
index 0000000..718c499
--- /dev/null
+++ b/meituan_note.md
@@ -0,0 +1,3 @@
+#link-(http://tech.meituan.com/archives)
+
+#
diff --git a/note/java/monitor.png b/note/java/monitor.png
index 47d577a..f3e3225 100644
Binary files a/note/java/monitor.png and b/note/java/monitor.png differ
diff --git a/note/python/README.md b/note/python/README.md
index 9205783..bb50145 100644
--- a/note/python/README.md
+++ b/note/python/README.md
@@ -12,7 +12,7 @@
 16. [Python实用技巧](./useful_features.md)
 17. [python测试](./testing.md)
 18. [gevent简介](./gevent.md)
-19. [Django应用部署(nginx、gunicorn、virtualenv、supervisor)](.\note\python\deploy_django_with_nginx.md)
+19. [Django应用部署(nginx、gunicorn、virtualenv、supervisor)](./deploy_django_with_nginx.md)
 20. [理解WSGI](./wsgi.md)
 21. [Flask之Hello world详解](./flask.md)
 
diff --git a/note/python/collections.md b/note/python/collections.md
index bd65ca8..a98a09e 100644
--- a/note/python/collections.md
+++ b/note/python/collections.md
@@ -22,7 +22,7 @@ namedtuple是在python2.6中开始出现的,在collections模块下面,它扩展
 语法是这样的:  
 
     collections.namedtuple(typename, filed_names[, verbose])
-地一个参数指定新类型的名字,第二个参数是字符串(用空格或者逗号隔开)它构成了这个类型的域. 如果verbose等于True.那么就会打印出类生成信息.  
+第一个参数指定新类型的名字,第二个参数是字符串(用空格或者逗号隔开)它构成了这个类型的域. 如果verbose等于True.那么就会打印出类生成信息. 
 
     >>> People = namedtuple("People",'age name', True)
     class People(tuple):
diff --git a/note/python/iterator_generator.md b/note/python/iterator_generator.md
index 0799a05..1af4547 100644
--- a/note/python/iterator_generator.md
+++ b/note/python/iterator_generator.md
@@ -12,7 +12,7 @@
 等同于生成器表达式：  
 
     （i*i for i in xrange(start, stop))
-列表推倒式是：  
+列表推导式:
     
     [i*i for i in xrange(start, stop)]
 
diff --git a/note/resource/image/Binary_tree.png b/note/resource/image/Binary_tree.png
index db33b98..2f13acd 100644
Binary files a/note/resource/image/Binary_tree.png and b/note/resource/image/Binary_tree.png differ
diff --git "a/note/resource/image/android/QQ\346\210\252\345\233\27620140921080706.png" "b/note/resource/image/android/QQ\346\210\252\345\233\27620140921080706.png"
index 61248f2..eec112f 100644
Binary files "a/note/resource/image/android/QQ\346\210\252\345\233\27620140921080706.png" and "b/note/resource/image/android/QQ\346\210\252\345\233\27620140921080706.png" differ
diff --git a/note/resource/image/android/avd.png b/note/resource/image/android/avd.png
index 4132ecf..a2fecd4 100644
Binary files a/note/resource/image/android/avd.png and b/note/resource/image/android/avd.png differ
diff --git a/note/resource/image/android/emulator.png b/note/resource/image/android/emulator.png
index cc6db7c..b964543 100644
Binary files a/note/resource/image/android/emulator.png and b/note/resource/image/android/emulator.png differ
diff --git a/note/resource/image/android/layout.png b/note/resource/image/android/layout.png
index 8a548a6..3c9ac51 100644
Binary files a/note/resource/image/android/layout.png and b/note/resource/image/android/layout.png differ
diff --git a/note/resource/image/android/layout1.png b/note/resource/image/android/layout1.png
index 9c4774d..099ec15 100644
Binary files a/note/resource/image/android/layout1.png and b/note/resource/image/android/layout1.png differ
diff --git a/note/resource/image/android/notication_elements.png b/note/resource/image/android/notication_elements.png
index 6880e90..bea99a6 100644
Binary files a/note/resource/image/android/notication_elements.png and b/note/resource/image/android/notication_elements.png differ
diff --git a/note/resource/image/android/notification.png b/note/resource/image/android/notification.png
index 1c39020..b546a4b 100644
Binary files a/note/resource/image/android/notification.png and b/note/resource/image/android/notification.png differ
diff --git a/note/resource/image/android/viewgroup.png b/note/resource/image/android/viewgroup.png
index fa07799..e547d46 100644
Binary files a/note/resource/image/android/viewgroup.png and b/note/resource/image/android/viewgroup.png differ
diff --git a/note/resource/image/dataflow.png b/note/resource/image/dataflow.png
index bb43fb2..e329a26 100644
Binary files a/note/resource/image/dataflow.png and b/note/resource/image/dataflow.png differ
diff --git a/note/resource/image/exceptions0.png b/note/resource/image/exceptions0.png
index 392c2a2..e138601 100644
Binary files a/note/resource/image/exceptions0.png and b/note/resource/image/exceptions0.png differ
diff --git a/note/resource/image/exceptions1.png b/note/resource/image/exceptions1.png
index b72952f..7839e50 100644
Binary files a/note/resource/image/exceptions1.png and b/note/resource/image/exceptions1.png differ
diff --git a/note/resource/image/ff.png b/note/resource/image/ff.png
index b7870bf..2c8b1e9 100644
Binary files a/note/resource/image/ff.png and b/note/resource/image/ff.png differ
diff --git a/note/resource/image/filetype.png b/note/resource/image/filetype.png
index 382e910..8b8071f 100644
Binary files a/note/resource/image/filetype.png and b/note/resource/image/filetype.png differ
diff --git a/note/resource/image/git.jpg b/note/resource/image/git.jpg
index 728e611..3190978 100644
Binary files a/note/resource/image/git.jpg and b/note/resource/image/git.jpg differ
diff --git a/note/resource/image/grammer_tree.jpg b/note/resource/image/grammer_tree.jpg
index 7bcfd6f..8ef5f04 100644
Binary files a/note/resource/image/grammer_tree.jpg and b/note/resource/image/grammer_tree.jpg differ
diff --git a/note/resource/image/html_search0.png b/note/resource/image/html_search0.png
index fe0db6e..f31cbdb 100644
Binary files a/note/resource/image/html_search0.png and b/note/resource/image/html_search0.png differ
diff --git a/note/resource/image/html_search1.png b/note/resource/image/html_search1.png
index 26bf5a9..c636658 100644
Binary files a/note/resource/image/html_search1.png and b/note/resource/image/html_search1.png differ
diff --git a/note/resource/image/index_analysis.png b/note/resource/image/index_analysis.png
index 31f1224..7ee07af 100644
Binary files a/note/resource/image/index_analysis.png and b/note/resource/image/index_analysis.png differ
diff --git a/note/resource/image/interaction.png b/note/resource/image/interaction.png
index d8dc95c..c58b5a6 100644
Binary files a/note/resource/image/interaction.png and b/note/resource/image/interaction.png differ
diff --git a/note/resource/image/inverted_index_thumb.jpg b/note/resource/image/inverted_index_thumb.jpg
index 02a6fc6..79f194b 100644
Binary files a/note/resource/image/inverted_index_thumb.jpg and b/note/resource/image/inverted_index_thumb.jpg differ
diff --git a/note/resource/image/io/bio.png b/note/resource/image/io/bio.png
index 57d14b7..4ea4b1f 100644
Binary files a/note/resource/image/io/bio.png and b/note/resource/image/io/bio.png differ
diff --git a/note/resource/image/io/nbio.png b/note/resource/image/io/nbio.png
index c2216cb..b98881a 100644
Binary files a/note/resource/image/io/nbio.png and b/note/resource/image/io/nbio.png differ
diff --git a/note/resource/image/json2python.png b/note/resource/image/json2python.png
index a5f9fad..f8d4f1d 100644
Binary files a/note/resource/image/json2python.png and b/note/resource/image/json2python.png differ
diff --git a/note/resource/image/map.png b/note/resource/image/map.png
index 1add506..854afb7 100644
Binary files a/note/resource/image/map.png and b/note/resource/image/map.png differ
diff --git a/note/resource/image/memcached-item.png b/note/resource/image/memcached-item.png
index 73a5ddc..b3d46e8 100644
Binary files a/note/resource/image/memcached-item.png and b/note/resource/image/memcached-item.png differ
diff --git a/note/resource/image/nff.png b/note/resource/image/nff.png
index ce27bce..96723de 100644
Binary files a/note/resource/image/nff.png and b/note/resource/image/nff.png differ
diff --git a/note/resource/image/nginx-alias.png b/note/resource/image/nginx-alias.png
index 6f010ce..7784cf4 100644
Binary files a/note/resource/image/nginx-alias.png and b/note/resource/image/nginx-alias.png differ
diff --git a/note/resource/image/nginx-root.png b/note/resource/image/nginx-root.png
index d188c87..50452b2 100644
Binary files a/note/resource/image/nginx-root.png and b/note/resource/image/nginx-root.png differ
diff --git a/note/resource/image/pinghengtree.png b/note/resource/image/pinghengtree.png
index 5b28fcc..ec724b2 100644
Binary files a/note/resource/image/pinghengtree.png and b/note/resource/image/pinghengtree.png differ
diff --git a/note/resource/image/postinglist.jpg b/note/resource/image/postinglist.jpg
index 4273e88..e0a8ba3 100644
Binary files a/note/resource/image/postinglist.jpg and b/note/resource/image/postinglist.jpg differ
diff --git a/note/resource/image/python2json.png b/note/resource/image/python2json.png
index 0da3ab9..07c59b9 100644
Binary files a/note/resource/image/python2json.png and b/note/resource/image/python2json.png differ
diff --git a/note/resource/image/python_int_block.jpg b/note/resource/image/python_int_block.jpg
index bc07c91..9fe8f80 100644
Binary files a/note/resource/image/python_int_block.jpg and b/note/resource/image/python_int_block.jpg differ
diff --git a/note/resource/image/pythonblock_small_int.png b/note/resource/image/pythonblock_small_int.png
index 73897a4..26ffb1d 100644
Binary files a/note/resource/image/pythonblock_small_int.png and b/note/resource/image/pythonblock_small_int.png differ
diff --git a/note/resource/image/rebase1.png b/note/resource/image/rebase1.png
index b5f585b..3b1f9bc 100644
Binary files a/note/resource/image/rebase1.png and b/note/resource/image/rebase1.png differ
diff --git a/note/resource/image/rebase2.png b/note/resource/image/rebase2.png
index 0ea42f5..f1d747a 100644
Binary files a/note/resource/image/rebase2.png and b/note/resource/image/rebase2.png differ
diff --git a/note/resource/image/recode.jpg b/note/resource/image/recode.jpg
index 5bc62b1..008365b 100644
Binary files a/note/resource/image/recode.jpg and b/note/resource/image/recode.jpg differ
diff --git a/note/resource/image/slab.png b/note/resource/image/slab.png
index e8a63ac..5089105 100644
Binary files a/note/resource/image/slab.png and b/note/resource/image/slab.png differ
diff --git a/note/resource/image/solr.png b/note/resource/image/solr.png
index 06aa48a..39b0135 100644
Binary files a/note/resource/image/solr.png and b/note/resource/image/solr.png differ
diff --git a/note/resource/image/tlist.png b/note/resource/image/tlist.png
index 57f8d14..4181749 100644
Binary files a/note/resource/image/tlist.png and b/note/resource/image/tlist.png differ
diff --git a/note/resource/image/tokenizer.png b/note/resource/image/tokenizer.png
index e39fad2..80fa661 100644
Binary files a/note/resource/image/tokenizer.png and b/note/resource/image/tokenizer.png differ
diff --git a/note/resource/image/vim17_1.png b/note/resource/image/vim17_1.png
index a8fc934..0971007 100644
Binary files a/note/resource/image/vim17_1.png and b/note/resource/image/vim17_1.png differ
diff --git a/note/resource/image/vim17_2.png b/note/resource/image/vim17_2.png
index 58030db..20eea81 100644
Binary files a/note/resource/image/vim17_2.png and b/note/resource/image/vim17_2.png differ
diff --git a/note/resource/image/vsm.jpg b/note/resource/image/vsm.jpg
index c9f522b..f3b2f93 100644
Binary files a/note/resource/image/vsm.jpg and b/note/resource/image/vsm.jpg differ
diff --git a/note/resource/image/weight.png b/note/resource/image/weight.png
index f4c042d..47ec314 100644
Binary files a/note/resource/image/weight.png and b/note/resource/image/weight.png differ
diff --git a/note/resource/image/wordform.png b/note/resource/image/wordform.png
index a777c0c..dac258d 100644
Binary files a/note/resource/image/wordform.png and b/note/resource/image/wordform.png differ
diff --git a/note/resource/image/yiyuan0.png b/note/resource/image/yiyuan0.png
index 9fb3640..4572ec7 100644
Binary files a/note/resource/image/yiyuan0.png and b/note/resource/image/yiyuan0.png differ
diff --git a/thearding b/thearding
new file mode 100644
index 0000000..8ec1a47
--- /dev/null
+++ b/thearding
@@ -0,0 +1,3 @@
+join 
+应该在所有进程全都start之后进行
+join将会使后续的进程无法start
diff --git a/xcode_framework.md b/xcode_framework.md
new file mode 100644
index 0000000..7069ca2
--- /dev/null
+++ b/xcode_framework.md
@@ -0,0 +1,97 @@
+
+
+#1-error
+
+##reason?: compiled with older version of Swift language (2.0) than previous files (3.0) 
+#solve: Build Setting / Swift Complier- Version
+Use legacy Swift Language Version ---Yes
+
+
+#2-error
+
+##reason?:framework not found
+
+#solve:
+copy the abc.framework to current directory file
+
+Build Setting /Search Path:
+
+Framework Search Paths: /User/xxx/xxframework
+
+### Q1 将生成的库放进去当前文件夹
+
+## Q2 编译库，包括swift,object c 建议分开打库成framework
+ 注意：生成的库的object c头文件写进到库文件里面
+
+framework
+ 
+1-object c 头文件 需要进行拖文件到公共区域 ［ Build Phases- Compile Sources-Headers (Private/Public)］
+
+2- object c 头文件需要 本头文件上填写暴露的头文件
+
+---
+```swift
+#import "TestOCFuntFolder.h"
+#import "TestOCFunt.h"
+```
+3-编译
+
+## 放进swift framework 进行调用情况
+－ 调用先将头文件放进到 带上 object c framework name / 暴露的头文件
+－ 调用使用时候，可以这节调用
+
+## 项目中使用
+－ 项目使用需要导入模块名，然后调用其中的函数
+
+## error bug
+1 no image -can not solve 
+2 not build module 
+3 
+
+
+
+### Q3 cocoapods
+podfile.lock,podfile dirr err 
+: No such file or directory
+```
+rm -rf all podfile 
+pod init 
+open podfile and import your dependency
+pod install
+pod setup
+open xx.xcworkspace (not xxx.xcodeproj)
+```
+
+### Q4 
+项目使用情况：
+旧版本swift 会进行swift语言版本编译问题，设置Swift Complier --version : Yes
+所有的代码，需要使用原来的代码风格，参考appdelegate.swift即可
+
+新版本就不会
+
+framewwork  同样会遇到这个问题
+
+
+### Q5 
+项目使用情况：
+多模块同时进行使用，如何进行一次导入，其它的controller也可以使用
+
+
+### 使用cocoapod 好处－1
+swift 调用oc , 不需要头文件之类的东东
+
+```swift
+import SVProgressHUD
+
+    SVProgressHUD.showInfoWithStatus("hello hud!")
+    
+```
+### 使用cocoapod 好处－2
+多库同时进行管理版本，具体问题c可参考Q3
+
+### 使用cocoapod 好处－3
+
+
+
+
+
diff --git a/xcode_plugins.md b/xcode_plugins.md
new file mode 100644
index 0000000..bba469a
--- /dev/null
+++ b/xcode_plugins.md
@@ -0,0 +1,26 @@
+#Package Manager
+>* 管理插件的管理器alcatraz (https://github.com/alcatraz/Alcatraz)
+
+#CodeColors
+>* 控制台打印的颜色管理（https://github.com/robbiehanson/XcodeColors）
+
+#CocoaPod
+
+>* ???kattrali/cocoapods-xcode-plugin [do not know how to slove !!! ]
+
+#YYModel
+
+
+#CFNetwork
+
+#Almor
+
+
+#Jenkins ?
+
+https://github.com/emqtt/CocoaMQTT
+https://github.com/MHaroonBaig/MotionKit
+https://github.com/ashleymills/Reachability.swift
+https://github.com/Alamofire/Alamofire
+https://github.com/mdiep/Tentacle
+https://github.com/SwiftyJSON/SwiftyJSON