init

apps/manage/apps/task/serializers.py

@@ -22,8 +22,8 @@ class ManageTaskSerializer(serializers.ModelSerializer):
 
 
 class ManageTaskAddSerializer(serializers.ModelSerializer):
-    instrument = serializers.ChoiceField(choices=INSTRUMENT_CHOICES, label='''产品合约''')
-    code = serializers.CharField(label='编号')
+    instrument = serializers.ChoiceField(choices=INSTRUMENT_CHOICES, label='产品')
+    code = serializers.CharField(label='合约')
     max_val = serializers.DecimalField(max_digits=10, decimal_places=2, label='高点')
     min_val = serializers.DecimalField(max_digits=10, decimal_places=2, label='低点')
     type = serializers.ChoiceField(choices=(('A', '多'), ('D', '空')), label='趋势')

apps/market/views.py

@@ -21,7 +21,7 @@ def cta(timestamp, last_price, task):
     over = False
     if _type == 'A':
         if max_val == min_val:
-            if last_price > min_val:
+            if last_price >= min_val:
                 style = '突破'
                 point = '预值'
                 point_val = min_val
@@ -46,7 +46,7 @@ def cta(timestamp, last_price, task):
                 over = True
     if _type == 'D':
         if max_val == min_val:
-            if last_price < min_val:
+            if last_price <= min_val:
                 style = '突破'
                 point = '预值'
                 point_val = min_val

fish/settings.py

@@ -254,10 +254,10 @@ REST_FRAMEWORK = {
 # ==========
 # = Email  =
 # ==========
-EMAIL_HOST = 'smtp.exmail.qq.com'
+EMAIL_HOST = 'smtp.qq.com'
 EMAIL_PORT = 25
-EMAIL_HOST_USER = 'traffic@xiaogu8.com'
-EMAIL_HOST_PASSWORD = 'W1ccb4v3rt'
+EMAIL_HOST_USER = 'notify@huxiapp.com'
+EMAIL_HOST_PASSWORD = 'HuXiJianr3n'
 EMAIL_USE_TLS = True
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'