From e4ddd6d27734b51480962b203af01936029b880d Mon Sep 17 00:00:00 2001 From: hackrobot Date: Wed, 20 Mar 2024 21:31:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddb=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/crud.cpython-312.pyc | Bin 2343 -> 2542 bytes __pycache__/main.cpython-312.pyc | Bin 15896 -> 15986 bytes __pycache__/models.cpython-312.pyc | Bin 1025 -> 1190 bytes __pycache__/schemas.cpython-312.pyc | Bin 1006 -> 1095 bytes crud.py | 9 ++++++++- kunpeng.db | Bin 24576 -> 8192 bytes main.py | 13 +++++++++---- models.py | 10 +++++----- schemas.py | 6 ++++++ 9 files changed, 28 insertions(+), 10 deletions(-) diff --git a/__pycache__/crud.cpython-312.pyc b/__pycache__/crud.cpython-312.pyc index b460edaae8fbf1cc082279272fd327937a0f4628..181974042a67dadaae488ef6f2352518a1503cb5 100644 GIT binary patch delta 515 zcmZ23^iG)XG%qg~0}xEO@heq|bt0bxW7kA=rFw=GrW}?imJ|@p8pWEzoXVKOlFF9G zlET`;62%VYv!!wX`RqVGX9_P^gd>$Lg%hZXErqLvHHr%?#+}NXB?htq6##Ye0Cnc=#bkaa#m#e=O&A%4CtqX< z;SvOjG6V7FdzbVQDH{@$$QxnUx^uYH4ZKQf15&i;Ex zm`ht}9QHV(bv^h(8#yFl))7*;@vYU1j)w{91KpWW9znv6s?`-In;+z20~~mwQg+(G z*AH=cn8O!1Y~qmSFo=M59_8yH4#O~67gD~6%RSZ8b-OI21C~9*WC()ZB-sX=y-8&^ zGBYsc{hj4cP4KJ|tM0CU$3k|&e;UU~9QLjIn$@m-0`IOHBiEs!X^fnQd{ckZNoG+y zr!WgtR=diiV%LsW-)%}0@|WsLb1NZVsk;10Lf(UoEkh5!!J5^rT)3i8P#9{Mcu&BcmS2$*@bkd&$JBQwCDy9i zTQPt|@(L-pm3W@TQ1_L1X~bY{pK;ofCO6j!jn1Z_l=;3?Td=mPW9FG6QbpEgn4<0% z5s$L~x_*E;FG%y&GM+`a-5T;TXNebFj9d@=wzZ3N!{5Up@W_rq^`Ni7-qsrp37HHF<$R`*)meQS-VBGshfQ6>uZmT>iTbMW`KR#fNJTS5qKupNFKoNu*qsg%C%sWgy4OFE5V4xQ1sNHF|TU9)tJ8arm^O*<<_sQaq&|H%nm7<;Xpyc$P)(DTPIgp-W$1 z;CosI$zCN9-H?cvXmY7CEN`r(UGvdDem4Z?ZVzw^#!GunW28QSRG9E-2)_Bjo1( zUv4#4^#x`-X(j>B8_^Eq2B+5;dQoiflGxy7Q6Iz5PLz9PjohoBBbP?Gijdnc96H0= zb1i1Q#0>xS+kCH?Ily>8Z1uX4r~2=%;e5}ak+ZPe-n#c3yZg(>=E47iVlbImnY+Y) ziDE3t#!MtlM`zv;&NzfK=gkUge@4y)!MSeO=zi0*`*w;#X4)1Z5NgoSP~=MGB5L=N6k?wH^@J?KJ=b-E!A2jdVL6WjoOb1-HSr^64%v6 z@!Va8!B{VT*o*gkT;6{CvuX_}@dFWAo%%NOpw)mlSw9r9+scHIVrd^&ZtGY z6C&OI2ybchF$CR~DHO7rs>`|QNsW$h`r|O#y&=wfqHa4ft!DE@U49ZxiJe7r7VVwd z;ic|FWH)@+9o(_r^j^)BGP-T5FrJ^DpuG9lLgBkPjua1^}$5lla z=kOdpMQ8O=?|Efl*&jMPb!O^@e{kWzwSgPSO}LsHS#~#8dKVK5GnadBx*u3}H{5cE zZn#5>?#te5Be&ec)&2d$#D4m#D{jf_ul{D>e%Z+zA-#wI|JoF(6ZeEgPI?Fu>1|{L zrqcanCtOTFeSoK#@^-4rh3R66UgGZw4sUVb?Tzx=iY}{@hf9>-Qz*Y%P=1FnqTqF; z0S-K}JB~pt%dvcRm@Y$R@W&kv(o>l@n?I9Zk#Kp%{t=%(RwRpWMaI=i05%T&%sy%* N{(r7K2_FvK_didpiX#93 delta 2521 zcmZ`*eQZ-z6z^@{>&Mz{NY`!cx~^N-Z3VVr5D+?Ge8`M27!V~opwzu)wrsEEwS0Oj zA0i@tP&_CgRuK>|BPyw%F-HAECBcsn5=mY__=ETdf9L{6jWNb^@9P_d#GAZx&%Nh& z&;6Zq?tAy$q=#t5`SS8I1Geku|Bih=^K8W$u}r|B37=bAVX?Ipu8NgzkwI9Kh-5rt z8Zm04odlLy0~LZkUSSA{OQ6TRfSBO0IqYskn8L(leA3-0wi|vo8!DY3T23}M<5&rz z2pJVWcB*YKmWgag$CPwPP&6z2Xqg~}&=`h)E#FwZ3~f^U@SU|`(nK66_b}0fBF!lK z{eERU_Nq;ZMJ4V_X~*%rLXGWyLOP(YtXb^BiA9AiWdSmu@lvKR!6FJ-R57K*<&1J4 zo0`hRG$y7qaX%9?P#}R>OrOa_7_Qj8VmGQQ3jf-d8Oa>ztC&q@!oG?iSpXka1jXfO zTmx4tzBXE`VA#@BI9K_Ou{=qQl51TXx(G?tkaPB$tnys=Vf;$$tDw!cX5`~)XzW=;8+R!I*qa86XtN^@xS z5rb4qT__jkMO-Y(C#h5FDI$*I_zkG4Z6$l5t2S7^3Ab8Yw5iyMa{M4LSGn0^X~At%W1Qc>#Xgd?;TcV0zpM+|vWmSo1xQi7HEu10N{ z7JVww28(^Iq!qe6UdZ`u;nn&MdY|=V>UA{VWexSPU35;I$wSB_0>64XZFL;8me#@h z)h-f+uDW^%*V(ExVo2JC&;d^R2Hfz5#5zeraB7^ZGN!xaspNC;X`RC~sM&#dJ!BG0 zZgLTBvp=EZHM>22*En(K*tJd{j}+5G48@gWp0Zx(ayQz&W5K&&x7*iNQkG&WsQZpu zm}C!zH3ZkadIpBk_4e@rq}pBI9+G*$HlCZLUZtE-{uWoIxa}ynt;dwK@ysbKbEb5n z6TWgdNd~OG037r-C-Bdx!yct*JiNo*=1xS5)Z)iTOeXxjp# zzI#nR>SM&px9VBUHqZv}*SKItgM(;V|Cp8?)81@wY-^O}a{pFo8+BlHx3fcPPF-vLI z4T+lKQtV(-jm>^U=b)Xm%Gaf_n9VwkQcz` zYn+ZOY0C(^EwCZGwKP~PbU#NQ<>}l#EJgr5DlaxD9fAASuNnnPen3oJ_>|b*3z2HghzUipi2HB$9Di>0!H(r>r}!|j;?Fvu0rGVNrJr@COyE!& z9tr#G{Ey%*oK^0FZQ+Ha2fhhUCB5)Z`0;L*RE6D-s*p;iGpg_~{?}+Je1nMhRn)V$Q9#FG4? zTTEq!lczDcFs_+=o2kLD!Sg1c$b_)&yaxB1yuuUQy5kz$5DWpa31yS{fND7TC$M$P zH98fkPL5}e@=yV~yhs&9r~!#z95%W6DWy57c12o1F34xavOwYkGb1D8eFo>N49<5M V)Sog)eqj?~l;|+|$^fLm+5sOzPy+w} delta 103 zcmZ3+*~r0rnwOW00SI25`jt9&BJTyJCkzwsKbb7dq|7KX*_>(pWIkpW#`?*@%ndA! yo<$0iSy-Z^l@<$ diff --git a/__pycache__/schemas.cpython-312.pyc b/__pycache__/schemas.cpython-312.pyc index 156f437c6e9333a108414f0447a8754a070ba25e..31f4f90362ba3e84045167a8d06afe029561f11d 100644 GIT binary patch delta 423 zcmaFIew>5%G%qg~0}w>q_?5bKB5yO}l8F;*byAsASyFgxfZ|{lFPy~(XYqqrl>(ZA zlZ6=bWpA-3Wu|AOCZ^nC%SlX1%_+XcR-9j2l$?5tsmyS4BV!Yz?_?GxD~V>m8@vL| zJ~w#yo4p|f2X~8mk@RFIrWy63Kog6^K!iAuxW$oQlpCL$pORW61rn165i%eNHs}1j zw9ND(MIZ+xTFee4S{QB!i+6HBlqmxR{508$&`e~`%quC91j-eG6rdSfR4)e-1Q8%5 z#ezVhmEi^lceDFDHHtiCb; HDX;?p7jQd$ diff --git a/crud.py b/crud.py index fe3d8c1..9c1e311 100644 --- a/crud.py +++ b/crud.py @@ -2,7 +2,8 @@ from sqlalchemy.orm import Session # from . import models, schemas import models, schemas - +import json +import time # 通过id获取用户 def get_user(db: Session, user_id: int): @@ -23,6 +24,7 @@ def get_users(db: Session, skip: int = 0, limit: int = 100): # user:schemas.UserCreate # **user def create_user(db: Session, user:schemas.User): +# def create_user(db: Session, user): db_user = models.User( wxid=user.wxid, openId=user.openId, @@ -35,7 +37,12 @@ def create_user(db: Session, user:schemas.User): wxaccount=user.wxaccount, remark=user.remark, smallhead=user.smallhead, + bighead=user.bighead, + labels=user.labels, + source=user.source, + v1=user.v1 ) + db.add(db_user) db.commit() db.refresh(db_user) diff --git a/kunpeng.db b/kunpeng.db index efbb3973f2ba7896b76cd100aa7c3efea8d2ad22..5ab9185a6786b54eaf44b7076b496e5109de3fd6 100644 GIT binary patch literal 8192 zcmeH~O>fgM7{}9rgf=k-LNM(XjSG`tjqNyzInhmpb!$85+D)B=Cfjk^uqG)<+O<3J zB3{IhxFZf+;j$YDao{8HDK>52f~07u<-!4R0Qs-j$@BM19{(gCp0&G0Hx{ZBgdUAm zq?}hW8Re#`DvEMCX=6z{Q6~9Fy%VMJ?{r$3_dic2vohzJO7cia0+N6vAPGnUl7J*2 z2}lBxfFvLZ{O1IoT*{o8o}SJ;8;>b#iB2TKXwZ!$%F}Qm&H5vq4+<1$%bbi$rfY$XbG`wdhJQ{8fJCR3Qt)`$O zhhlEySF1&tXhkC{2k8wv4dIKB#z8o2cENCTr&1{8Ds^=wUstcX_T0o=TAQCb`%Rg8 zKUGOyQj&lqAPGnUl7J*22}lBxfFvLZ{3`^WDyJ?hAj$T^bYbe!mC48S@x93@<;nH5 zaNN>$fFMje9l*u%Qilom_~DzQug?$P?j5||JO1$MX#dgS#}|i>_76XOIe7UF$f`bLE0w4m#e(?h3OV%j}oxZHp{7qg|IHufE>66?hvuUR)Ckz3SZ+DEcmU>2@t7 z{(ZZfE5(~DOGRskbPD{IsJ8s7zFwyu-dHMUlN0_UnQBHCZD~+r z$byDrYe)myPhs2Cp&=}4nHDgA*jNLC5{hg_0dxp<3}$Fl!^oh3+ROkL2@G{)n~uqW z#vz0zhn8X3nn{2GDFQ?whY{1p7IT<}HPZwPBMV_-pkz6w2E(Sw2s0SrL?=44DYgN& zY(hA)b#7Y1;22oY)J?~L++r5L8O0&>8zQWYT~uafX3{p$;OZoUuHX2RzLxnb+kOXR CSc}I1 literal 24576 zcmeI&(Qnc~90%|g1`3l^Lk!`;hyOwQRuL!X$ zYhAUhYH8KhRJ$D?)xm7`^5lx+y7f5tRZt1`#<{g|zS!^lzG4KrAOHafKmY;|fB*y_ z009VGTi{bBTY6Tqzw)5ZW_;FF%bju5?X##S_(bwBFoA5%qt!Mgb@vVZKrTxoO_!Kd zvY8lMQA?X|m6FX?%S$dt%w%USFKiMLCCzJHY^zi%*=N4=KgR`3m9@A^yZX98m($4S zcwbGpO?RnB+-94&okrsk$>$cu-&eib+p4Dni3yWLI6MuQ=>9FDQ}@04yQ+6c_UIwm zegtBOd}>Dlb%=CU!T7sCqE*txNWKPrZrF7i- zK_>y8$kQ%yNi$BneAF&K3dY6snWxm*%j_-P^ZoE*&x%-Ft#CP+3ZKpt!;(h54ks+A zuS6m?OD6QfX&}Ws8JdXj3lDlM8H>WH=&_a*$)KK%oKIE~1Kt}3{&*#JI`ezxeUgKP zA`!!6BpUmp(J}K^rdw;et+rQHUk}o0QLokA-y;`4+d{sg*XAi_ns%nn&ujmQVITw` z009U<00Izz00bZa0SG_<0z{} zfB*y_009U<00Izz00bcL9}8sCj{PK+OP6zte-`Nb|LRBo*dPD_2tWV=5P$##AOHaf zKmY;|xWNK>eQj9(-{4Oemj(d{KmY;|fB*y_009U<00I!OEUf?WEr0+7AOHafKmY;| OfB*y_009Wxe1Sh!eKZUJ diff --git a/main.py b/main.py index 005929e..bb19d30 100644 --- a/main.py +++ b/main.py @@ -48,6 +48,9 @@ async def root(): @app.post("/users/") # schemas.UserCreate决定了swagger文档 def create_user(user: schemas.User, db: Session = Depends(get_db)): + print('user',user) + print('typeuser',type(user)) + db_user = crud.create_user(db, user) if db_user: raise HTTPException(status_code=400, @@ -212,8 +215,9 @@ def kp(event_data): # 将好友信息=>保存到数据库 newFriendDict=WXBotService.get_friend_info(account_wxid, wxid) print('newFriendDict[data]---',newFriendDict['data']) - # print(type(newFriendDict['data'])) - crud.create_user(db=get_db(),user=json.dumps(newFriendDict['data'])) + userClass=models.User(**(newFriendDict['data'])) + print('userClass====',type(userClass)) + crud.create_user(db=SessionLocal(),user=userClass) elif msg_type == 3: # 3 图片消息 @@ -237,8 +241,9 @@ def kp(event_data): xml_msg.get('scene')) newFriendWxid=xml_msg.get('alias') # 将好友信息=>保存到数据库 - newFriendDict=WXBotService.get_friend_info(account_wxid, newFriendWxid) - crud.create_user(db=get_db(),user=newFriendDict) + # newFriendDict=WXBotService.get_friend_info(account_wxid, newFriendWxid) + # userClass=models.User(**(newFriendDict['data'])) + # crud.create_user(db= SessionLocal(),user=userClass) elif msg_type == 42: # 42 名片消息 xml_msg = ET.fromstring(msg) diff --git a/models.py b/models.py index ad7138c..2446fa0 100644 --- a/models.py +++ b/models.py @@ -20,11 +20,11 @@ class User(Base): wxaccount = Column(String) #微信号 remark = Column(String) #备注 smallhead = Column(String) #头像 - # bighead = Column(String) #头像-打 - # labels = Column(String) # - # source = Column(String) #来源 - # generator = Column(String) - # v1 = Column(String) + bighead = Column(String) #头像-打 + labels = Column(String) # + source = Column(String) #来源 + generator = Column(String) + v1 = Column(String) diff --git a/schemas.py b/schemas.py index 45fb242..104272c 100644 --- a/schemas.py +++ b/schemas.py @@ -13,6 +13,12 @@ class UserCreate(BaseModel): wxaccount: str remark: str smallhead: str + bighead: str + labels: str + source: str + v1: str + +