bb

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
+<<<<<<< HEAD
       <change afterPath="$PROJECT_DIR$/helloo.py" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/native/images/chengjie.jpg" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/native/pages/food/index.js" afterDir="false" />
@@ -26,6 +27,10 @@
       <change beforePath="$PROJECT_DIR$/web/static/plugins/ueditor/dialogs/emotion/emotion.html" beforeDir="false" afterPath="$PROJECT_DIR$/web/static/plugins/ueditor/dialogs/emotion/emotion.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+=======
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
+>>>>>>> f69eff95df939a1f840036c96bddb29290a52715
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -211,6 +216,7 @@
     <option name="width" value="1192" />
     <option name="height" value="944" />
   </component>
+  <component name="ProjectId" id="2WJ11onTGGugGaDtKcTv4XwPgYJ" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -272,7 +278,13 @@
       <pane id="Scope" />
     </panes>
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../miyamer" />
@@ -300,18 +312,7 @@
       <recent name="D:\order\web\controllers\user" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration" SSL_PROTOCOLS="sslv3">
     <configuration />
     <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
@@ -323,6 +324,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1528044544203</updated>
+      <workItem from="1696435658643" duration="586000" />
     </task>
     <task id="LOCAL-00013" summary="python学习">
       <created>1564628624793</created>
@@ -712,7 +714,7 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="UnknownFeatures">
     <option featureType="com.intellij.fileTypeFactory" implementationName="*.js" />

web/controllers/api/Member.py

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # -*- coding: utf-8 -*-
 from web.controllers.api import route_api
 from  flask import request,jsonify,g
@@ -162,3 +163,169 @@ def memberInfo():
         "avatar_url":member_info.avatar
     }
     return jsonify(resp)
+=======
+# -*- coding: utf-8 -*-
+from web.controllers.api import route_api
+from  flask import request,jsonify,g
+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
+from common.libs.member.MemberService import MemberService
+
+@route_api.route("/member/login",methods = [ "GET","POST" ])
+def login():
+    resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
+    req = request.values
+    code = req['code'] if 'code' in req else ''
+    app.logger.info(code)
+    if not code or len(code) < 1:
+        resp['code'] = -1
+        resp['msg'] = "需要code"
+        return jsonify(resp)
+    openid = MemberService.getWeChatOpenId(code)
+    app.logger.info(openid)
+    if openid is None:
+        resp['code'] = -1
+        resp['msg'] = "调用微信出错"
+        return jsonify(resp)
+    nickname = req['nickName'] if 'nickName' in req else ''
+    sex = req['gender'] if 'gender' in req else 0
+    avatar = req['avatarUrl'] if 'avatarUrl' in req else ''
+    '''
+        判断是否已经测试过，注册了直接返回一些信息
+    '''
+    bind_info = OauthMemberBind.query.filter_by(openid=openid, type=1).first()
+    if not bind_info:
+        model_member = Member()
+        model_member.nickname = nickname
+        model_member.sex = sex
+        model_member.avatar = avatar
+        model_member.salt = MemberService.geneSalt()
+        model_member.updated_time = model_member.created_time = getCurrentDate()
+        db.session.add(model_member)
+        db.session.commit()
+
+        model_bind = OauthMemberBind()
+        model_bind.member_id = model_member.id
+        model_bind.type = 1
+        model_bind.openid = openid
+        model_bind.extra = ''
+        model_bind.updated_time = model_bind.created_time = getCurrentDate()
+        db.session.add(model_bind)
+        db.session.commit()
+
+        bind_info = model_bind
+    member_info = Member.query.filter_by(id=bind_info.member_id).first()
+    token = "%s#%s" % (MemberService.geneAuthCode(member_info), member_info.id)
+    resp['data'] = {'token': token}
+    return jsonify(resp)
+
+@route_api.route("/member/logintwo",methods = [ "GET","POST" ])
+def logintwo():
+    resp = {'code': 200, 'msg': 'rjb操作成功~', 'data': {}}
+    req = request.values
+    app.logger.info(req)
+    name = req['name'] if 'name' in req else ''
+    app.logger.info(name)
+    phone = req['phone'] if 'phone' in req else 0
+    app.logger.info(phone)
+    storename = req['storename'] if 'storename' in req else ''
+    app.logger.info(storename)
+
+    name_info = Mendianuserinfo.query.filter_by(nickname=name).first()
+    if not name_info:
+        model_mendianuserinfo = Mendianuserinfo()
+        model_mendianuserinfo.nickname = name
+        model_mendianuserinfo.mobile = phone
+        model_mendianuserinfo.storename = storename
+        db.session.add(model_mendianuserinfo)
+        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': {}}
+    req = request.values
+    code = req['code'] if 'code' in req else ''
+    if not code or len(code) < 1:
+        resp['code'] = -1
+        resp['msg'] = "需要code"
+        return jsonify(resp)
+
+    openid = MemberService.getWeChatOpenId(code)
+    if openid is None:
+        resp['code'] = -1
+        resp['msg'] = "调用微信出错"
+        return jsonify(resp)
+
+    bind_info = OauthMemberBind.query.filter_by(openid=openid, type=1).first()
+    if not bind_info:
+        resp['code'] = -1
+        resp['msg'] = "未绑定"
+        return jsonify(resp)
+
+    member_info = Member.query.filter_by( id = bind_info.member_id).first()
+    if not member_info:
+        resp['code'] = -1
+        resp['msg'] = "未查询到绑定信息"
+        return jsonify(resp)
+
+    token = "%s#%s"%( MemberService.geneAuthCode( member_info ),member_info.id )
+    resp['data'] = { 'token':token }
+    return jsonify(resp)
+
+@route_api.route("/member/share",methods = [ "POST" ])
+def memberShare():
+    resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
+    req = request.values
+    url = req['url'] if 'url' in req else ''
+    member_info = g.member_info
+    model_share = WxShareHistory()
+    if member_info:
+        model_share.member_id = member_info.id
+    model_share.share_url = url
+    model_share.created_time = getCurrentDate()
+    db.session.add(model_share)
+    db.session.commit()
+    return jsonify(resp)
+
+
+@route_api.route("/member/info")
+def memberInfo():
+    resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
+    member_info = g.member_info
+    resp['data']['info'] = {
+        "nickname":member_info.nickname,
+        "avatar_url":member_info.avatar
+    }
+    return jsonify(resp)
+>>>>>>> f69eff95df939a1f840036c96bddb29290a52715