ab

config/base_setting.py

@@ -44,7 +44,12 @@ UPLOAD = {
 
 APP = {
     # 'domain':'http://106.52.204.179:8999'
+<<<<<<< HEAD
        'domain':'https://python815.cn'
+=======
+
+
+>>>>>>> 86554b9ce9fff07f8fcb5b67a271976c08d3b684
 
 }
 
@@ -61,4 +66,4 @@ PAY_STATUS_DISPLAY_MAPPING = {
     "-7":"待发货",
     "-6":"待确认",
     "-5":"待评价"
-}
+}

config/production_setting.py

@@ -1,13 +1,14 @@
-# -*- coding: utf-8 -*-
-DEBUG = True
-QLALCHEMY_ECHO = True
-SQLALCHEMY_DATABASE_URI = 'mysql://root:~renjianbo0118mysql*&;@127.0.0.1/food_db'
-SQLALCHEMY_TRACK_MODIFICATIONS = False
-SQLALCHEMY_ENCODING = "utf8mb4"
-
-
-APP = {
-     'domain': 'http://106.52.204.179:8999'
-     # 'domain':'https://python815.cn'
-}
-RELEASE_VERSION="2019822001"
+# -*- coding: utf-8 -*-
+DEBUG = True
+QLALCHEMY_ECHO = True
+SQLALCHEMY_DATABASE_URI = 'mysql://root:~renjianbo0118mysql*&;@127.0.0.1/food_db'
+SQLALCHEMY_TRACK_MODIFICATIONS = False
+SQLALCHEMY_ENCODING = "utf8mb4"
+
+
+APP = {
+     'domain': 'http://106.52.204.179:8999'
+     # 'domain':'https://python815.cn'
+}
+RELEASE_VERSION="2019822001"
+