From 0fc49f6333733b1586c6c25f137634ca52330ba0 Mon Sep 17 00:00:00 2001
From: RainSun <zhaoyingbo@live.cn>
Date: Fri, 28 Feb 2020 17:21:06 +0800
Subject: [PATCH] update ignore & update sort

---
 .gitignore                                 |   4 +---
 README.md                                  |   2 ++
 __pycache__/coc.cpython-37.pyc             | Bin 2113 -> 0 bytes
 lib/__pycache__/db.cpython-37.pyc          | Bin 2843 -> 0 bytes
 lib/__pycache__/photoUpload.cpython-37.pyc | Bin 1262 -> 0 bytes
 lib/db.py                                  |   4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 __pycache__/coc.cpython-37.pyc
 delete mode 100644 lib/__pycache__/db.cpython-37.pyc
 delete mode 100644 lib/__pycache__/photoUpload.cpython-37.pyc

diff --git a/.gitignore b/.gitignore
index bf15cde..e08c6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-lib/__pycache__/allFunction.cpython-37.pyc
-lib/__pycache__/crawler.cpython-37.pyc
-lib/__pycache__/mail.cpython-37.pyc
+__pycache__
 .vscode/settings.json
diff --git a/README.md b/README.md
index 1fde172..877cfa1 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,8 @@ gunicorn coc:app -c gunicorn.conf.py
 pstree -ap|grep gunicorn
 // 关闭某服务
 kill (pid)
+//关闭venv
+deactivate 
 ```
 
 ## 错误代码一览
diff --git a/__pycache__/coc.cpython-37.pyc b/__pycache__/coc.cpython-37.pyc
deleted file mode 100644
index a690063de510699a20e64356acff4c422a1d3471..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2113
zcmb7FTW=dh6yDkO{TAoa+$qKsBul6US|o&A3rI*`P>7UNNUI2I<C)lQ_QvciA{I!{
zzyp-1MNp)o2pXhR>PuUmiYS!-F|X84`oud=oSBU`bp#C=d&hIWvva<4oAI03Y)XOQ
zUY&o>jVsEZLg<YsEMAAlJBt(rD;SxIt`OxSx}joq8zF&dre;O-h!xeNR!omsaXoG&
z^n{hvlU7Pk$#)`V+REq|E30R%oSs7p$&i5!q~}Tg;vkOV7>+kooY+)x5~n^>Kr<vY
zX~2=hGdL^pVTtGP0N{B%xT)bGJS;UMQZo|nIDtncenR47AwG^LBt9zf$q=8y(-I$(
z_){T%5<e~Rafuf~{25%7_yifi&#tLg5q%M#BKg`R$={gTRv>P)sFa?2Byu_5j-D=?
zt(8)or!B)a8su%K(XxBOLepUmPX?MdFzzj9iP>A8CyZx;7iI}FS|-m1(u`wS#AYRp
zN9Rn#TjOy`-uH>ec-$kN*K+K3vTV4mG9#ADwexQ+@yNnEi%TWM;}&5}2YYqlVsEIh
zn1RO|f{8(?F<Mh;4y%h$YzRo3ry0=r??OkUDotjY)l>mSrAZ82Fw9oNK3A-RM}!sw
zjnul;y*u~z9(>dJe5d=x<?hz6oh$b$Ww-B*?zQWkFSonj-QBzSY4_(#fBp8=qpeS1
zy?g)b&h77mZHM=CZeHsCu=Vhl&F;4kI)7}yp3ap!5AW~nUccY@{o208A9r@QE+5{x
zclRgwhG?ZM0@#mb#lh?U9ZSo0eO6%WE;(0Z<U>|0d|;S92#4Y;mLCgm#b?a1tGnB`
zA(l#cUkp-L7JStdxFFM6QmHtSJQmdFmO}F&%IWXo%xlXRJVL$YSI)e2=Irt;@z$8*
zF4ujJE!Um;X?LCH42<2TV-wrAR*1Ca#lV81rg9OLio&*2vL{T@g<<)jqDokPQDmkt
zw1GZWJ`#mT^Wc|IOM}op8YSL=XLJx$JSr^~VCh9*Qq%;ZBk<cElziY7bIQJJItJ$2
z!iA+du$cor&v}ft>a6BL4>!p{Oa2d^G}yoI6CD=oFk697nSie*$)AT84qO`pshtT@
zVXT%RZ^uc7i110oano3>fz22CILG@rF)@$BDQ@H=Il<=3eVh~hoDIVII7O0Y#0JrJ
zOxaKlN{*=LoD%xi%*p`4*sEf1Q12L`lOVMR!lYt(UG?!D(PZ#1^u!obBCmnj>H#x!
z+LU0<hs^chYCH~g;t1-rpx(DT+s8c(5>M1>meI0nwWZQD*SvL)M_hw7dCYKKVq=~*
zOmoh+>kO{t;4Eo^P&SgRtVlMM@e5CQbX8pGG$~L~8=4j<u-Jx0YBjEbT^^;554Wv2
z*7B@T(bZJ685MPx^^mEd(#I$!D}Dn`uWvtgQskMDM>tWj9PFE<Dyrn2geieC=#)C5
TCe+E%@z`W+y!VNwPz?P8iDLR#

diff --git a/lib/__pycache__/db.cpython-37.pyc b/lib/__pycache__/db.cpython-37.pyc
deleted file mode 100644
index 1f8450860d5076e7d535eb05572b8f99cba049ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2843
zcmd6p?~fBj7{_O3XWMP>2gh;z5EaFo=Bjun7}Q*d0YL%*&%_G>8@2R0+hdRIZkgR0
zdg<{7OnieF6=NbHM*<1H@YHCc^2WFR4f|GlIo|jO_{#4y+bad@3lkIFW@qMkW_EV^
zneX$=zBV+JXSjYJJ^J3JLB@U~WBn3n?8hA`6pAVCvl=gQPHo|fnpL!FvM6C&MO#T_
zUt-0K%BU>rta4NiwWIQC0Ci3csv*>QHLNzE9#A7{BkDmlsy3k>Qe(5Mu=yU|#0oqa
zcq0tv!-Kx(25~_o&YN=!ZY4gdlH5WR2Bk*q`N@EC-*^46Uc;CQrw4J-n(01>J35Ub
z#=0-^B_4An&I-M)h1I^ymKbUYd!oe`#DX<Twhj9gV@qRaU>`BIZR{-UQ^wBBGUecA
zSaWV>aaWC2tLCPsrYd1&`kX&ob*r<X-n-uqD`o#o7{$}O_w0G`CF<5TR+ZSL*p1>u
z`shpSYS;+y-^fV)dE+td!-cG-f0Se+H;%nvzG%@bS-7-AMUD#EMS!x(dOnerFbKY4
zdKkVx1}3L`Z|)s6H(75cc+#h5qHQP`cl!N=9zkD)UP+gQn<h6vkD$>UjadswmwAib
zfEZ4);91FHaW=2_akeBlTO3q?-4e>W2Cxdg3*r=en*}IICMt7H09<y)JBDp*Y{sOk
zS3YTfaBKDIx2u;|+IK!}-~4Xvhg$_J$+}usLggkIG-}a&l0&WBxa|4&e#LW%2+tOT
z-iW3iMNzQK>Wg_Vh+G|)!oW>(ub;2D_1FsoOej@3E+<Y|sZ!jmy9sv<rnJ~VGiK0t
z{J>!%6q(rIf{*eMv7PJf@Ktb|>j5xTxaOg%=J@#?sp6LT4R(mVJG=x;%c8{z)w!{g
z>$oi7daH{IsDMlM!DYvC*(T5wSJYo{X3XAuC1SS;?<Li&-MGE>(U0vbpRbd<k3`cL
zJw^qQ1|gzFO3^8@j6s&jss{~b%JsS%D7}ToOB!gaMy(#<u}8_`o_>V7NLxM7vh!|y
z9P8K#cSL=ROT!K1ILJK-&;NlOiQhX-<OqlfvVV-ufapc1AH!VwaVoml^bVLEX!;52
z>W9q%w!;+r&tXJAZp5=fN~4PsM>iA$7|rSRP*gk?Eq0N6(AkpJvh<`9v9&B)7L;S9
z%7Vf=p@)#2M9A9E;2CHT8GLaBz1gkEYAva99UaOGvKzLP>GCs)Rr1tdwUkLC(lBXI
z5T${9_ovJ4ufJ$tyWJb1_W++Y22gm427LVC>i1VWqBIj2y%thY79A2LMX@FbMv#WA
z0bQ^Y;i-fmnqW?aExn)`_NAS}z(Xc??8Rgq+=6d`R7b@yLR?S4-^ESp@8T}PXg(9O
zm@=OLZY#yD)<ahSJ#rt=P5`Y0+8Lm=fHqIq5xmHG$c5Ggs|yuJWa<Z6{S@A?D94fH
z6B+A<i)?OJ5Zi7tq+Gw$Kt3zcU-M3od>;nblLLG9$4*1r@ypdT-DMheB)|?$5^F)~
zr%~aY#ycn@YLa4KeAs0liSYpXBYY|##3?b3f!j8&Ct>#|cM3htaR^n=nQ>pJh8zU@
z05?jD$GhCRXT?L@=;I<iLvkH%_ISM!ok_BlutuK)UPO#2VXb|0X>H|B_h7mE%gX9!
zKX;O3e`eA!)6e7KRCGO<^j7ljqM~0o=R2<lrDGV=Lx~O$P<jF0|B#YVm!85Rym%c@
z`^)R?o0tDJKs5Q^19G%m_nW|TqA#A^@Xi#5i`jb9d{LS2o}!$?Ctpwell0R)qVw1s
zEqW)lD0+<$4QEZW^_)}Y#4;zmv#%DahVQ-#1}vh3V33bk(sD+eoRi0Ikjg&+2f}1h

diff --git a/lib/__pycache__/photoUpload.cpython-37.pyc b/lib/__pycache__/photoUpload.cpython-37.pyc
deleted file mode 100644
index 6b5388c9955c24d62a0c06989ffb39ccbbfb8d75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1262
zcmZ8gOOG2x5bnpk{9J2UvJi0tAAE5xIU>Ys*(?f9qzwXE2y52W>x@12nC>1nti~6N
zgg79$!(n_uLgEK-h&b~b`U)Z13qODp)oo=J(WCyls=IpX@m0Uw=`;zBfA&v43qwNw
zbjq`lpztP6JwpHjG$+EXET;=57~So0!Tnhv0!e0J9eIppvZY%p8nOu-0tg|37!qhq
z;|&!pXhQ32BHGY~4z3;O!XB<&pr>TeyF!0tG@y1*%Sox^_&m$yGF?c)SIep3_eaNq
z&sHeCfB#qnvz0_~nw<-NeDdCey4yJ18sK~fr+x(iXhr5xakC;d%D}b^*vrJwd4x{+
z$kO4JyE9-mQhJqV#_qp$_wK!qj@}&~ef;2Pbb4}cbc#_W&%*hIC|9F@4~Dn$?CjIk
z!@?9FuJR&<;p$7<PV>CDkl>?tcA6m&s$9h<PIQCgypHk?Du&ERO}C_GfCXF=!|MPT
z@GV=@ib61_>b41iZKw$=x}k?;?IiM?&MJl(g`>-M|C9cr5B)p+5BjIdC3gi5Tm*y2
zCXgCwvW2vKSzOpe8+Gp0NTo|C7B+TkwltRG(SVB>%^sk=XzUC|<w7*dW%hX~QS`;w
zK?5Dw)<j8kFfPjsTDYOx2!!@%n<j`os$M|-ny&~IH$7iJpn#R2H8ULRfVq1usIVsb
zHA8C5eM>2+$SiU!t}$ozm5D1hOEwgx#!g!Eir2mck?jEO0@K<M;D@9NuySF=>h{i0
zMXPYj+&>|#uw8$`8tz)wO9U(099=es!&{}NScIN$<p@-c!K*(Iuz6ys)T98ZV$`z=
zt6uJ-^yJ6ipMLwz-}U1skH7!xx9^_*`tyLP7xBPGcwwQZgN|i|w!tbj4{b0jvZamB
zQY|4<X!0o2M%!eO&fSK#p=(0zd&xUeuDKLGVdAT51D$>$k>glNWJep}yLRk;M$hrK
zdrp?iM@F=l^5Xi1{h!13F4?iq)zPJIAQ0L`5}WvSarO`oXp^Z|@no>44sj9P3#sOp
zvYZY}ljV9BUI$N9&%sLwHcrp9&o;)ed_c+AM=~C(o6dl1X_V`UU7pUrck*16?qMn4
cZprJ50?J&z;rd)VFNyE8gdNZuG~r3|9~QhatpET3

diff --git a/lib/db.py b/lib/db.py
index 2f8e00d..1443c6f 100644
--- a/lib/db.py
+++ b/lib/db.py
@@ -111,9 +111,9 @@ def getRank():
     time_rank = []
     count_rank = []
     try:
-        for i in col('rank').find({},{"_id":0}).sort([("time",1)]).limit(10):
+        for i in col('rank').find({},{"_id":0}).sort([("time",1),("count",1)]).limit(10):
             time_rank.append(i)
-        for i in col('rank').find({},{"_id":0}).sort([("count",1)]).limit(10):
+        for i in col('rank').find({},{"_id":0}).sort([("count",1),("time",1)]).limit(10):
             count_rank.append(i)
     except Exception as e:
         print(e)