MOD:修改启动时环境检测机制

ServerWrapper.py

@@ -5,7 +5,7 @@ import tornado.httpserver
 import tornado.ioloop
 import tornado.options
 import tornado.web
-from tornado.options import define, options
+from tornado.options import define, options,OptionParser
 from model.common.file_pid import PID
 from urls import urls
 from model.log import logger
@@ -25,10 +25,12 @@ class HttpServerWrapper(tornado.web.Application):
     def __init__(self, port=80,debug=True):
         self.port = port
         handlers = urls
-
-        r=self.get_ip()
-
-        auth = True if r == '47.111.161.141' and sys.argv[1] == '8008' else False
+        #默认为开发环境,只有当dev输入时为生产环境
+        auth = True if 'pro' in OptionParser().parse_command_line() and sys.argv[1] == '8008' else False
+        if auth:
+            print('生产环境,启动')
+        else:
+            print('测试环境,启动')
         settings = {
             "port" : sys.argv[1],
             "auth": auth,
@@ -56,6 +58,7 @@ class HttpServerWrapper(tornado.web.Application):
 
 
 def main():
+    #TODO:日志这部分需要设置一下,有问题
     PID.write()
     tornado.options.parse_command_line()
     http_server = tornado.httpserver.HTTPServer(HttpServerWrapper())

data_manage/pitcher_panel.py

@@ -677,7 +677,7 @@ def get_channel_order_trend(user_id,channel,pitcher,start,end,page,page_size,ord
                 round(sum(cost)/sum(order_user),2) order_user_per_cost,
                 round(avg(require_roi),4) require_roi,
                 round(avg(require_mult),2) require_mult,
-                round(sum(expect_profit),2) expect_profit,f
+                round(sum(expect_profit),2) expect_profit,
                 round(sum(annual_expect_profit),2) annual_expect_profit,
                 concat(sum(da1),',',sum(da1)/sum(cost),',', 0,',',1) d1,
                 concat(sum(da2)-sum(if (da2,da1,0)),',',sum(da2)/sum(if (da2,cost,0)),',', (sum(da2)-sum(if (da2,da1,0)))/sum(if (da2,cost,0)),',',if(sum(if (da2,da1,0))=0,1,sum(da2)/sum(if (da2,da1,0))) ) d2,