Merge branch 'luzhaoyamg_1111' into development

# Conflicts:
#	.idea/workspace.xml

service/Sql_vcc.py

@@ -591,23 +591,16 @@ def id_user_credited(validity_date,user_id):
 
 def day_incoming_parts(Same_day_first,Same_day_next):
     """当日客户数"""
-    print(Same_day_first,Same_day_next)
     _Sql = """select count(distinct user_id) count, apply_status applyStatus from risk_record
      where created_at >= "{0}" and created_at < "{1}" group by apply_status;""".format(Same_day_first,Same_day_next)
-    print('----2----')
-    print(_Sql)
     _df = pd.read_sql(_Sql,con_vccthree_vcc_talos)
-    print('----3----')
     return _df
 
 def day_amount_credit(Same_day_first,Same_day_next):
     """当日授信总额度"""
-    print(Same_day_first,Same_day_next)
     _Sql = """select sum(limit_amount) totalCount from acs_limit_record where limit_record_type = 'New'
      and limit_amount > 0 and create_time >= "{0}"and create_time < "{1}";""".format(Same_day_first,Same_day_next)
-    print('----2----')
     _df = pd.read_sql(_Sql,con_vccthree_acsdb)
-    print('----3----')
     return _df
 
 def sale_phone_white(phone_no):

startup.py

@@ -61,5 +61,5 @@ if __name__ == "__main__":
     app = apps()
     http_server = tornado.httpserver.HTTPServer(app)
     http_server.bind(options.port)
-    http_server.start(num_processes=0)  # num_processes=0  # tornado将按照cpu核数来fork进程
+    http_server.start()  # num_processes=0  # tornado将按照cpu核数来fork进程
     tornado.ioloop.IOLoop.instance().start()