Merge branch 'jhao104/master' of https://github.com/1again/proxy_pool into 1again-jhao104/master

# Conflicts:
#	DB/DbClient.py
#	Util/GetConfig.py

Config.ini

@@ -3,7 +3,7 @@
 ;type: SSDB/MONGODB if use redis, only modify the host port，the type should be SSDB
 type = SSDB
 host = 127.0.0.1
-port = 6379
+port = 8888
 name = proxy
 ;username = your_username (Only Mongodb)
 ;password = your_password

README.md

@@ -195,7 +195,7 @@ freeProxyCustom  = 1  # 确保名字和你添加方法名字一致
 
 　　这里感谢以下contributor的无私奉献：
 
-　　[@kangnwh](https://github.com/kangnwh)| [@bobobo80](https://github.com/bobobo80)| [@halleywj](https://github.com/halleywj)| [@newlyedward](https://github.com/newlyedward)| [@wang-ye](https://github.com/wang-ye)| [@gladmo](https://github.com/gladmo)| [@bernieyangmh](https://github.com/bernieyangmh)| [@PythonYXY](https://github.com/PythonYXY)| [@zuijiawoniu](https://github.com/zuijiawoniu)| [@netAir](https://github.com/netAir)| [@scil](https://github.com/scil)| [@tangrela](https://github.com/tangrela)| [@highroom](https://github.com/highroom)| [@luocaodan](https://github.com/luocaodan)| [@vc5](https://github.com/vc5)
+　　[@kangnwh](https://github.com/kangnwh)| [@bobobo80](https://github.com/bobobo80)| [@halleywj](https://github.com/halleywj)| [@newlyedward](https://github.com/newlyedward)| [@wang-ye](https://github.com/wang-ye)| [@gladmo](https://github.com/gladmo)| [@bernieyangmh](https://github.com/bernieyangmh)| [@PythonYXY](https://github.com/PythonYXY)| [@zuijiawoniu](https://github.com/zuijiawoniu)| [@netAir](https://github.com/netAir)| [@scil](https://github.com/scil)| [@tangrela](https://github.com/tangrela)| [@highroom](https://github.com/highroom)| [@luocaodan](https://github.com/luocaodan)| [@vc5](https://github.com/vc5)| [@1again](https://github.com/1again)
 
 
 ### Release Notes

Util/GetConfig.py

@@ -47,7 +47,7 @@ class GetConfig(object):
 
     @LazyProperty
     def db_password(self):
-        return self.config_file.get('DB', 'password', fallback="default pwd")
+        return self.config_file.get('DB', 'password', fallback=None)
 
     @LazyProperty
     def proxy_getter_functions(self):