From 5f7d17fc5ddd40ec8e8c8ad26cf377119e31e2fc Mon Sep 17 00:00:00 2001
From: lijingwei233 <531347509@qq.com>
Date: Thu, 20 Feb 2020 22:42:16 +0800
Subject: [PATCH] add combine phone

---
 __pycache__/coc.cpython-37.pyc             | Bin 0 -> 2113 bytes
 lib/__pycache__/db.cpython-37.pyc          | Bin 0 -> 3025 bytes
 lib/__pycache__/photoUpload.cpython-37.pyc | Bin 0 -> 1262 bytes
 lib/allFunction.py                         |   5 ++-
 lib/crawler.py                             |  37 +++++++++++++++++++--
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 __pycache__/coc.cpython-37.pyc
 create mode 100644 lib/__pycache__/db.cpython-37.pyc
 create mode 100644 lib/__pycache__/photoUpload.cpython-37.pyc

diff --git a/__pycache__/coc.cpython-37.pyc b/__pycache__/coc.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a690063de510699a20e64356acff4c422a1d3471
GIT binary patch
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#

literal 0
HcmV?d00001

diff --git a/lib/__pycache__/db.cpython-37.pyc b/lib/__pycache__/db.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4281b00f3eadd59f6b1fbf89abb8d3f136083182
GIT binary patch
literal 3025
zcmd6pTaOe)6vw;zGShR}Wf?#a@xI~?D&Qg)2{9mu7}xP(Bj7|GW~X|WUV6HR>Kemr
zW_bY<V}ck3W8%i_CXnERsL@2_#aBN=z4#!rS-yf#{!jJnFyOqHm}pP>RG+Hqn(E&<
z^{;w)XeevodiA5yd%x!m;}3FHFB1<3amO5n8=M73os}7*XEQMCR@tiCWgEU#cDT)*
zi$*!cQ#_3_&0U^B>GCYkq0I0+A3~Ys!+Z_O93SCpQRaDpuR}S+*H0S74R`QQMv<x9
z8&NnD9S(diltojyZ%)m6HTfD>nb|lBD^2MKD#yL|y&!7T(Wl1fMO-vzx)0-yPr*pc
z`vRM1l5z8lDK@n++r7rTfzpOQ)@HNjtTjo#1Am|PZSAMvAJe|0{WScO+D}ay+{JBR
z&Y9BOvvry+pW44;M=h%DKO0O=d()GV*nKdFYSrL$6wCe3kB{%#L(Rg$tdvucUM!Uz
zpiMc`Q8UE1k(1PCb&Y;LT1*T2B9)FkDgAJ!Y|$ubR0)?%h73g!pscExQFbi~!><i7
zjJiK_+jj*1)H{4?d!wcBW<c-6n_vv)4*Hp51Z_3?OS&xFG`I$O3=ge>G}=JA$lAsd
zlHr6AZnF((p2>;>%$PTsF_-6n-8Q+k0I(c&=gpJG+eQdWX~I(rCcvdj{_6-^a{~rl
zzWizDgX_yzzgxa^vvcdS&b9AXe!O0^RN51w7I9Cd@KBFuR0bvYWYrJu{D$|G8J#Jb
zVl5s;0j6l_*_X3^7<)oiqR>;BSI*VEhV-Kl1KPYQtIDl%UXiVar<kWPC1wqcm_pmc
zp`%17)@y^AtiVRh%}i`YT@AOs?g2B0su^TeYu~x?B;yu=fLlJp2e1B|1!u`TV!S&%
z4|I!Wn-RXVV<%P-T0l76Lx^<*gzf-@8EG#%1fSLxwHNaxoe#>XA%#5TQ#FXaJG3T>
zj&h_g15f2@!mCQJBK^9j(tdrW(iDNp%1Bm&3cgt=n~3-oipe^>O4+!wbYtb?pE{R6
zUyaCJ)Pnkm^<*f5AWu=C3=~NyQaTjMp7xR3scNI)g<L#9{cY;#@MgUc<FzNrW4?Hh
znkZ-cf{~u_<OJsNII3f6GnkEdY^8`WL}Uy#|JR7nLK6>>*+S-Fn4%*dq31`*JVu5-
zOgsVOpCayrQ!o903|?dG2QNlx=%>i^po^_=yU4}U)HDdX3+P8lk)A=1LDY+=uTlQf
zMRL{?2nnZka8)2UlV;nvz_1GRT39mYt+pjz;I_0D?Y4ysCNUuOH92++k_E`gcF2i?
zwGd)0V0W1tL2G8C!Lw~U$#+PKectX#3aN0uq^yb$4Q*oGSNw1~65u%?KU0Z%Xi`mD
z@QLW${`pepn=d*GH~Q5?$E=w{C!bS?Pd;4!;c7S0^#FPe6q7_RyOijpID*jVB-gw(
zeyl?i(<8K6c#_3p>xmAEK?WU<Xr0@Q!MZ^(*%qXK!5oGhiJhqL1%XynF9=g`T3ZJP
z0VwSS(`QT2X`tQ-)FeB{f!YG<f<#y@&=!xt@H7Pku&wh}4>q>-q`sIfiEa3&IeQcv
z6U0L_J;0-cS3}$jD!oYfZ&7OBkFig+`&7h9L?hK~K&ZPUDSegG5I)WVws;O6jurR=
zk}EL|cVHGH&;fM(5ZZhA3T!>lxoi^?gmo~!lW1v;0-s5n+`T#6MlSc@jdkHobm3+1
zZf^HMqtj5b>1DdmoY6)zKCRNVs7~h>KPE)PZspsHD>rZTcEa1g-dw)&OILjdBeOL!
zu?sIJnMb_3pu|QzD>tZ4C$t8oTDCg}z?wks7{@@!ENyzU?E%$3`2Qg)onK-PCgICf
zN}Vsi>Rh|@uTi4G#a=Rl0J*|z1TEk>jvjx<^CD_X#o=<g(bDHYeOfEqQ#h#hDFLN_
z5-2)F=#5K|j_P%+vr%&vG+N&-sP{vCE^!akBi;<Wm%zY?X`{%q5zDsR5jW#z@yok8
GH~SZcahDMQ

literal 0
HcmV?d00001

diff --git a/lib/__pycache__/photoUpload.cpython-37.pyc b/lib/__pycache__/photoUpload.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6b5388c9955c24d62a0c06989ffb39ccbbfb8d75
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/lib/allFunction.py b/lib/allFunction.py
index 7931d01..ec67b09 100644
--- a/lib/allFunction.py
+++ b/lib/allFunction.py
@@ -137,9 +137,12 @@ def connect(data):
     # 用户密码
     pwd = data['pwd']
     # 进行登录
+    phone = ''
+    if data.get('phone'):
+        phone = data['phone']
     try:
         # 这里教务没问题，账户没问题就是200，密码错了就是101
-        res = connection(cid,pwd)
+        res = connection(cid,pwd,phone)
         return res
     except:
         # 这了就是教务挂了
diff --git a/lib/crawler.py b/lib/crawler.py
index 6567fd4..302860f 100644
--- a/lib/crawler.py
+++ b/lib/crawler.py
@@ -5,7 +5,26 @@ import base64
 from bs4 import BeautifulSoup
 import random
 
-def connection(username,password):
+
+def addphonenumber():
+    return '''
+<html>
+    <head align="center">
+        <p>请输入手机号</p>
+        <p>教务新要求，需要绑定手机</p>
+        <p>如果不放心，可以登录教务查看</p>
+        <p>谢谢</p>
+    </head>
+    <body align="center">
+        <input type="text" value="输入手机号"/>
+        <button>确定</button>
+    </body>
+</html>
+'''
+
+
+
+def connection(username,password,phone):
     s = requests.Session()
     # 获取统一身份系统的网页
     r = s.get(url='http://mysso-cust-edu-cn-s.webvpn.cust.edu.cn:8118/cas/login?service=https%3A%2F%2Fwebvpn.cust.edu.cn%2Fauth%2Fcas_validate%3Fentry_id%3D1')
@@ -20,6 +39,19 @@ def connection(username,password):
         'geolocation':''
     }
     r = s.post(url='http://mysso-cust-edu-cn-s.webvpn.cust.edu.cn:8118/cas/login?service=https%3A%2F%2Fwebvpn.cust.edu.cn%2Fauth%2Fcas_validate%3Fentry_id%3D1',data=formdata)   
+    soup=BeautifulSoup(r.text,'html.parser')
+    flag = soup.find(name='title')
+    if(flag.text=="手机号设置"):
+        execution=soup.find_all(name='input')[1]['value']
+        formdata = {
+            'phone': phone,
+            'execution': execution,
+            '_eventId': 'submit',
+            'submit': '提交'
+        }
+        print(execution)
+        r = s.post(url="http://mysso-cust-edu-cn-s.webvpn.cust.edu.cn:8118/cas/login?service=https%3A%2F%2Fwebvpn.cust.edu.cn%2Fauth%2Fcas_validate%3Fentry_id%3D1",data=formdata)
+        print(r.text)
     r = s.get(url='http://portal-cust-edu-cn-s.webvpn.cust.edu.cn:8118/custp/index')
     soup=BeautifulSoup(r.text,'html.parser')
     try:
@@ -36,6 +68,7 @@ def connection(username,password):
     data = json.loads(r.content.decode('utf-8'))
     student_name = data['data']['StudentDto']['XM']
     student_id = data['data']['StudentDto']['XH']
+    print(student_name)
     return {'errcode': 200, 'errmsg': 'ok', 'ip': ip, 's': s,'student_name':student_name,'student_id':student_id}
 
 def getGrade(Ip, S):
@@ -238,4 +271,4 @@ def getCurrentTime(Ip, S):
     )
     data = json.loads(r.content.decode('utf-8'))
     data_cache = data['data'].pop('DateList')
-    return {'errcode': 200, 'errmsg': 'ok', 'data': data_cache}
+    return {'errcode': 200, 'errmsg': 'ok', 'data': data_cache}
\ No newline at end of file