Merge branch 'dev' into test

.gitignore

@@ -63,5 +63,3 @@ target/
 data/
 *.csv
 *.pickle
-
-env.conf

config.py

@@ -1,4 +1,5 @@
 # coding:utf-8
+import os
 from log import Log
 log_ = Log()
 
@@ -285,17 +286,20 @@ class ProductionConfig(BaseConfig):
 
 
 def set_config():
-    with open('env.conf', 'r') as env_f:
-        line = env_f.read()
-        env = line.split('=')[1].strip()
+    # 获取环境变量 ROV_OFFLINE_ENV
+    env = os.environ.get('ROV_OFFLINE_ENV')
+    if env is None:
+        log_.error('ENV ERROR: is None!')
+        return
     if env == 'dev':
         return DevelopmentConfig(), env
     elif env == 'test':
+        print(env)
         return TestConfig(), env
     elif env == 'pre':
         return PreProductionConfig(), env
     elif env == 'pro':
         return ProductionConfig(), env
     else:
-        log_.error('env error')
+        log_.error('ENV ERROR: is {}'.format(env))
         return

env.conf

@@ -1 +0,0 @@
-ENV=test