python学习

.idea/vcs.xml

@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/mina" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/native" vcs="Git" />
   </component>
 </project>

common/models/member/Member.py

@@ -1,7 +1,10 @@
 # coding: utf-8
 from sqlalchemy import Column, DateTime, Integer, String
 from sqlalchemy.schema import FetchedValue
-from application import app,db
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
 
 
 class Member(db.Model):
@@ -17,17 +20,3 @@ class Member(db.Model):
     status = db.Column(db.Integer, nullable=False, server_default=db.FetchedValue())
     updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
     created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
-
-
-    @property
-    def status_desc(self):
-        return app.config['STATUS_MAPPING'][ str( self.status ) ]
-
-    @property
-    def sex_desc(self):
-        sex_mapping = {
-            "0":"未知",
-            "1":"男",
-            "2":"女"
-        }
-        return sex_mapping[str(self.sex)]

common/models/member/Memberinfoo.py

@@ -0,0 +1,18 @@
+# coding: utf-8
+from sqlalchemy import Column, DateTime, Integer, String
+from sqlalchemy.schema import FetchedValue
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
+
+
+class Memberinfoo(db.Model):
+    __tablename__ = 'memberinfoo'
+
+    id = db.Column(db.Integer, primary_key=True)
+    nickname = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    mobile = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    storename = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
+    created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())

common/models/member/Membermiya.py

@@ -0,0 +1,18 @@
+# coding: utf-8
+from sqlalchemy import Column, DateTime, Integer, String
+from sqlalchemy.schema import FetchedValue
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
+
+
+class Membermiya(db.Model):
+    __tablename__ = 'membermiya'
+
+    id = db.Column(db.Integer, primary_key=True)
+    nickname = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    mobile = db.Column(db.String(11), nullable=False, server_default=db.FetchedValue())
+    token = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
+    created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())

helloo.py

@@ -0,0 +1,11 @@
+from flask import Flask,url_for
+from imooc import route_imooc
+from flask_sqlalchemy import SQLAlchemy
+app = Flask(__name__)  # 创建1个Flask实例
+
+@app.route("/")
+def hello_world():
+    return "Hello World"
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0')

web/controllers/api/Member.py

@@ -5,6 +5,8 @@ from application import  app,db
 import requests,json
 from common.models.member.Member import Member
 from common.models.member.Mendianuserinfo import Mendianuserinfo
+from common.models.member.Memberinfoo import Memberinfoo
+from common.models.member.Membermiya import Membermiya
 from common.models.member.OauthMemberBind import OauthMemberBind
 from common.models.food.WxShareHistory import WxShareHistory
 from common.libs.Helper import getCurrentDate
@@ -70,9 +72,9 @@ def logintwo():
     storename = req['storename'] if 'storename' in req else ''
     app.logger.info(storename)
 
-    name_info = Mendianuserinfo.query.filter_by(nickname=name).first()
+    name_info = Memberinfoo.query.filter_by(nickname=name).first()
     if not name_info:
-        model_mendianuserinfo = Mendianuserinfo()
+        model_mendianuserinfo = Memberinfoo()
         model_mendianuserinfo.nickname = name
         model_mendianuserinfo.mobile = phone
         model_mendianuserinfo.storename = storename
@@ -80,6 +82,29 @@ def logintwo():
         db.session.commit()
     return jsonify(resp)
 
+@route_api.route("/member/loginmiya",methods = [ "GET","POST" ])
+def loginmiya():
+    resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
+    req = request.values
+    app.logger.info(req)
+    name = req['nickname'] if 'nickname' in req else ''
+    app.logger.info(name)
+    mobile = req['mobile'] if 'mobile' in req else 0
+    app.logger.info(mobile)
+    token = req['token'] if 'token' in req else ''
+    app.logger.info(token)
+
+    miya_info = Membermiya.query.filter_by(nickname=name).first()
+    if not miya_info:
+        model_membermiya = Membermiya()
+        model_membermiya.nickname = name
+        model_membermiya.mobile = mobile
+        model_membermiya.token = token
+        db.session.add(model_membermiya)
+        db.session.commit()
+    return jsonify(resp)
+
+
 @route_api.route("/member/check-reg",methods = [ "GET","POST" ])
 def checkReg():
     resp = {'code': 200, 'msg': '操作成功~', 'data': {}}

web/static/plugins/ueditor/dialogs/emotion/emotion.html

@@ -46,7 +46,7 @@
             tab3:['HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '泪眼', '流泪', '生气', '吐舌', '喜欢', '旋转', '再见', '抓狂', '汗', '鄙视', '拜', '吐血', '嘘', '打人', '蹦跳', '变脸', '扯肉', '吃To', '吃花', '吹泡泡糖', '大变身', '飞天舞', '回眸', '可怜', '猛抽', '泡泡', '苹果', '亲', '', '骚舞', '烧香', '睡', '套娃娃', '捅捅', '舞倒', '西红柿', '爱慕', '摇', '摇摆', '杂耍', '招财', '被殴', '被球闷', '大惊', '理想', '欧打', '呕吐', '碎', '吐痰'],
             tab4:['发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '顶', '幸运', '爱心', '躲', '送花', '选择'],
             tab5:['微笑', '亲吻', '调皮', '惊讶', '耍酷', '发火', '害羞', '汗水', '大哭', '得意', '鄙视', '困', '夸奖', '晕倒', '疑问', '媒婆', '狂吐', '青蛙', '发愁', '亲吻', '', '爱心', '心碎', '玫瑰', '礼物', '哭', '奸笑', '可爱', '得意', '呲牙', '暴汗', '楚楚可怜', '困', '哭', '生气', '惊讶', '口水', '彩虹', '夜空', '太阳', '钱钱', '灯泡', '咖啡', '蛋糕', '音乐', '爱', '胜利', '赞', '鄙视', 'OK'],
-            tab6:['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '天使', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
+            tab6:['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
         }
     };
 </script>