Merge branch 'master' of gitee.com:renjianbo0118/order

d

config/base_setting.py

@@ -43,8 +43,8 @@ UPLOAD = {
 }
 
 APP = {
-    # 'domain':'http://106.52.204.179:8999'
-       'domain':'https://python815.cn'
+     'domain':'http://106.52.204.179:8999'
+      # 'domain':'https://python815.cn'
 }
 
 PAY_STATUS_MAPPING = {

config/local_setting.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 DEBUG = True
 SQLALCHEMY_ECHO = True
-SQLALCHEMY_DATABASE_URI = 'mysql://root:123456@127.0.0.1/food_db'
+SQLALCHEMY_DATABASE_URI = 'mysql://root:123456@127.0.0.1/food_db?charset=utf8mb4'
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 SQLALCHEMY_ENCODING = "utf8mb4"
 # RELEASE_VERSION = "20190730"

config/production_setting.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 DEBUG = True
 QLALCHEMY_ECHO = True
-SQLALCHEMY_DATABASE_URI = 'mysql://root:~renjianbo0118mysql*&;@127.0.0.1/food_db'
+SQLALCHEMY_DATABASE_URI = 'mysql://root:~renjianbo0118mysql*&;@127.0.0.1/food_db?charset=utf8mb4'
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 SQLALCHEMY_ENCODING = "utf8mb4"
 

web/controllers/api/Member.py

@@ -106,6 +106,8 @@ def deviceinfo():
     app.logger.info(weidu)
     snnum = req['snnum'] if 'snnum' in req else ''
     app.logger.info(snnum)
+    reg_ip = req['reg_ip'] if 'reg_ip' in req else ''
+    app.logger.info(reg_ip)
 
     name_info = Deviceinfo.query.filter_by(nickname=nickname).first()
     if not name_info:
@@ -119,6 +121,7 @@ def deviceinfo():
         model_deviceinfo.jingdu = jingdu
         model_deviceinfo.weidu = weidu
         model_deviceinfo.snnum = snnum
+        model_deviceinfo.reg_ip = reg_ip
         db.session.add(model_deviceinfo)
         db.session.commit()
     return jsonify(resp)

接口文档

@@ -0,0 +1,3 @@
+https://www.showdoc.com.cn/item/index
+
+账户:263303411@qq.com   密码:18133922183