From 1a632e63e50620dca25c8d14dfbd1adad1552af4 Mon Sep 17 00:00:00 2001
From: baoliang <j2eer@163.com>
Date: Sun, 10 Jan 2021 21:22:39 +0800
Subject: [PATCH] add message

---
 management/views.py                           |  11 +++---
 polls/models.py                               |   2 +-
 polls/utils.py                                |  10 +++---
 polls/views/__pycache__/media.cpython-38.pyc  | Bin 7604 -> 7906 bytes
 polls/views/__pycache__/notice.cpython-38.pyc | Bin 5852 -> 6033 bytes
 polls/views/__pycache__/task.cpython-38.pyc   | Bin 3691 -> 3742 bytes
 polls/views/media.py                          |  33 +++++++++++++-----
 polls/views/notice.py                         |  10 ++++++
 polls/views/task.py                           |   3 +-
 9 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/management/views.py b/management/views.py
index 6fdbf7f..ee3da95 100644
--- a/management/views.py
+++ b/management/views.py
@@ -1,4 +1,5 @@
 import json
+from polls.utils import send_tnps
 from polls.models import Notice
 
 from django.contrib import messages
@@ -1717,12 +1718,14 @@ def news_management_create(request):
 
         news = News(type=t, title=title, author=author, date=date, content=content, source=source, image=image)
         news.save()
-        if t== 5:
-            profiles = Userprofile.objects.filter(id=15)
+        if t == '5':
+            profiles = Userprofile.objects.filter(status=1)
+            content = '管理员发布了通知，请查收消息'
+            phones = []
             for p in profiles:
-                content = '%s发布了通知，请查收消息' % (p, )
+                phones.append(p.user.username)
                 Notice.create_news_notice(p.user_id, content, news.id)
-
+            send_tnps(phones, content)
         messages.success(request, '添加成功！！！')
         return HttpResponseRedirect('/management/news/management/create/')
     type = News.NEWMEDIA_NEWS_CHOICES
diff --git a/polls/models.py b/polls/models.py
index 25efd81..1284ea7 100644
--- a/polls/models.py
+++ b/polls/models.py
@@ -77,7 +77,7 @@ class Notice(models.Model):
 
     @classmethod
     def create_news_notice(cls, user_id, content, news_id):
-        return Notice.objects.create(user_id=user_id, content=content, news_id=news_id)
+        return Notice.objects.create(type=2, user_id=user_id, content=content, news_id=news_id)
 
     @classmethod
     def create_reply_notice(cls, user_id, content, app, model, field, record_id, record_pass_value, record_reject_value):
diff --git a/polls/utils.py b/polls/utils.py
index 07864f6..487dcbf 100644
--- a/polls/utils.py
+++ b/polls/utils.py
@@ -14,7 +14,6 @@ from aliyunsdkcore.profile import region_provider
 
 
 def send_tnps(phones, content):
-
     url = 'https://api.tpns.tencent.com//v3/push/app'
     r = requests.post(url,
                       auth=HTTPBasicAuth(
@@ -23,11 +22,12 @@ def send_tnps(phones, content):
                           "audience_type": "account_list",
                           "account_list": phones,
                           "message": {
-                              "title": "【新媒体管理】有新消息",
-                              "content": content
+                              "title": content,
+                              "content": ''
                           },
                           "message_type": "notify"
                       })
+    return r
 
 
 def sent_sms_code(phone, code):
@@ -166,4 +166,6 @@ if __name__ == '__main__':
     #     'http://xgs.gansudaily.com.cn/pages/h5/hot/b3297046a53e47f594ed19db90c1183c.html')
 
     # print(og_title, og_description, og_url, og_image)
-    print(send_voice_notify('13993199566'))
+    # print(send_voice_notify('13993199566'))
+    r = send_tnps(['13609346975'], '')
+    print(r.status_code, r.text)
diff --git a/polls/views/__pycache__/media.cpython-38.pyc b/polls/views/__pycache__/media.cpython-38.pyc
index 8e85cf868274ac19d6b0ba2faf5600ae2f6a006e..6831a5b6f710a3043bc3c04920be15bd4bcc11f4 100644
GIT binary patch
literal 7906
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%0D6UrywW<
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
a?MVDz*Hle)Y^E8epJsYL(_>5@Bl^F90shbc

literal 7604
zcmbVR>ysQ+74OINW8O3S-emJ44;V^!F^bQq5d#83hy=tMk#TlzC+W^SHn)2S!CniE
zMWL`JC{iet&iX+_s{|EGDx&2dVfmpyStYw+KWSN|W%&hv=XCGv>|__vnVK`_-h1xr
z^gX|G&h7j2`HX_kr62#Q_UN3V{FMrWpA-s5@$>%<A{3!Em6lpnTUu39sjM~iR;rp}
zUT+#LvuZM*YFaI;YB6s#?N+*)Ze^;OR<@dL<*K<>zM5|ps)bguT4WisS!$K5W#+Bs
zNNcn@%DmkiYmHaORmDj;Wsw${Zzvbli)wX(%UO|2%9C8qi$YSK;&M@xlJYc{%VH!c
z@8I&N7)#1KxjZf=lJbn0JgHQs*05`(qD8segJ9ua$6x5QeJ9G@>37=erHUG58@@bM
za~^S83jvDh6ZO+>yB>5T3bv>RPT;njiWQm1I^7FyJF<^E=kIoeTaQwobAx(h-Ph>`
zZoLy_@An<KAUmhrrV|+tIPQEWGV%9_+s0613!P@uuQfXuy(XP=T~|5+_2%(T;5Hm^
zh0{(@>tc*rt0SCdL#5>>A07YnG(U}>e*`2{JUq{{nj8yMp$UCSJxO(1PZz0Wbx{pc
zJtI`XX@Mz>P!r}0ny`euq(L+3<5B9wJtyy5`yS?a32X3!deHTwVn?2?x7|nUf!k@<
zToGA*x6yEX|0T?WNh7O;LjAOJ8#<-@`YF~+%L&eOgw#kt|IDrTMLISjZ7OD3q^Mfc
z^#e&;sOXVJdv{PCXMwhJzQ#iSON!iws{h<IM|$+<=IfoNTW_D9gGxQ85%_b5Z#sO_
zT&pt={m!8ucWZUpE}oT3a-`t7hh68qKgVse3l}0Y9z2JUeKr<7qh{0`esVwRHYwRa
zMPJFcqp+Ql7u8Vp^j>ONS=2(!Gdy!q53HUY>QHzpNQ+dM5(X4*3X2tPAD3l}Cr5~k
z5}6<}338j92CZb|PO4!grsxnvMWV@Zs`*Y38K+$72T^YDAw`-iSk-bjb!QzLau4wb
zKq4y{fVD06Qavd-CfAWfx^*FW0JJ2(0HUytOz6laJ>7_!O?slOWbxy}coa(}J$Y(R
zgFaX@(2C-v_;?-)jDh26_AEZ0I@)dU2I(tI`6r+==t|fxXcyyyOs#3O8lmC0xivG?
znnkM_n*LMVnj31(qtyy6|7YA<7-|KyENhE)vWha7(xSAO3AJ8kS&@GhBW+ELE@tr@
z$Ifb(RjG;b#Y~V5jnE9OP!F@A7TRH2Of1=pxpoh7lPq_mn1WpH8o6nfdjxVjSngi2
z6LR@$<Yrjz1mt$H+@oSQ<O<iw?P0ka#9pj9*5y9zI3E<Rk-Uy1!(6Yltf)%7KkVlp
zLAf`A=T!&`$CNM4E*8c9P(7tiD2t_Fv^N$O@kGbNk~k1%#KAD<jf+F#`ej>HF01GM
z*uDk5Cs3<<lbH40k8wjXhIWpu<e;dya0dXS8;{Ew9H<TZh*FHAb_4i(x+5<{h9hN1
zcFB&f{_=M#KYViSneV^(^2=;OQK|vJ{3jXL%H^f2FTV1|YfEol{QVoRUAg+wmB?lU
z0Gf3P!md95^y+V(yyMs=5u*;I@w+_06F<ion_AQLAaL3QiIEbS(rMM@*)=lMHA3jf
zJkJm>^C(noIZJhRTnF2H9~BL^1<+&&mDi&}9wzbuZi3`|N7BC5J6l|p^pzhWQCj(M
zPb-N1jwD!H@0(64-?6tT*qcdfptBv<y;EPAMxQ7ZTv%|{r!~*P6TVZw?q2je=&wBS
z{L1gHym966)n{K>`Pp~g`2BbP_WDzAzWm#jUo5ZoUW?MA?w^_O)TM}Bj{5#cy(v-;
zGh$Yz7}n%Lj3f^cVRddmr*YdIcinnY?xH3}TtdVs?fNwVf7=N7DY3R$ZM^+tKYsmT
zM-r?>xu)~5(|lj8E?RC|7O85qAsrk=IPQh!g<6|kw!C3O_;4&7nGH8^9luhJF}Ok!
zY9~@p$@hTe!y#`Xj?TrvG03pXueIx~_?Set+lEtaHyn8sl99=4@go)SMx)cF^EeFT
zxnzla+zHzKKY%EDP9-EKpO;fpYGDgnKy6AbX&F#k)s*D>mi_<L=qb!GIF6~2AF=VJ
z8O-(Z;cGF|TN%BuO^dC|`>=yezK0Hb-$(xo1_<<f+dwE({lfvgG5MFiccC!J26DlB
z!}n~}O1?)Ab@(1?%?$M=-$Q=uDQ?ZJw+6;V1s+Qkc?4#!2Bv3uIzq3)5_>Ao4h>-+
zQQD6|q6mpU2k9Y+Od|0RBubF@caR;DfM?+`jzFT!9%3fQ56Qq=u*_6Y9BL`WEkPMx
zOb=5Rb$A5R8wvH(su)>PRpqn-uW5Rt-dJyZS%GKx@S@GTN{6;L;Z4HhjUG|JPk~D_
zH{nf#9|Ldoc7)Iy`-q1y$|PnZY17*YZk)Lpa1+e!0yoLrZg5k~?EyE<+$d%+#18Nl
z{&yZxplRxxJj2SaVUH0T*n4q2{z+iEa_Q@<-+N`iNwC>PDYh`=N&w}D>&>pyCG%c+
z?Dav!mmfkMB3y0Zto$fgNddR~1PG$^e0PD8g4!w9X$n8a0At}yr|rbn&4$f*-3NIF
zsmO@ogrcm<-i>H4hA9Rt#;TNX6PSvu&O8Uc^20Pg?Mi-(2-$%AI1xf``AH&#$?{Vm
zh}j)P^MRBU!N&MVa2e_KW-~@l!Y%oEs<SD^B$WVQ78abg*me&HP&uk(7-IyZ0ptTT
z3Vfp9Z3glL)qIY~gH)|{uYssUcMMT=$oLO|#Np<4;A8?E2($)ihHA8en$dDGbOGWh
zq(=#mweh81(!mT3QtkT32GfU-hX5gg0<+a&P?S&I5U8HUW~;$$VdP#a)P)YS{VF6<
zkhn82h9qE2Eb$;D3`jHsYe)jA0ZV)o5+)?R4b$H|OD2(+g2``g$;B-&O#`dRdj+q^
znVbsqJi2J|>d9zJUO7b2%;qx!F2h{O8wH<behgd=oY5N(Ei%+|S1@83<5RDcHvuls
z+$6XHb5r1o%uRzUF}DL;nYlcHhZq5G;2*{w>=a|*#*zF?h)GU<rjD~g$uB_fvGdz(
zR1%MXEGx$bQj2p@HY`4*@{4GWvfOx*^VDq*X?)u0@LiK%&B!lNH3eys4qY4~{4a(z
zU`m$rNTb;m&X74tI@0nKk$EB%3dW9p2oLBqB6MPdI!Z!pPz`XA!M3qsMN&}vzCIzx
z9_8YYR>08R=5wg=kAf)rR<^=+!?u!A$NF{xTe;R!JdCl)*-|ptPxP7ydAD=6Nis~y
zpTWuBMxv+t#{zrE{ZcErUvi=In_Gi4yHK1+vJ#QO`ObK7f=Gz6ut%hH-nt9CjB}QQ
z)T<&7sr-=Cx)byuRe)3^ijXP}NhJ=keGF1?xSZ&fAy*!f8-eQ~*F7Uf&^kKQIu^Gg
zxq{Qg7=eJz)h6H&Cn@O)rh3yzwd~O5R13~BNwqS;j^56YkYEOB)_7<N^zm?eC8n0+
zRO^=Z2{Ao1)-K2x-frmc-H*7VKjJgMkt~m(_x2<%KF3<mBcY>}<jLKF-wSSrInCP#
zei!&`@467FHM{sf(OP5Y3~oQT-H@=n1K{>BHvx{Ez2zMQx0ks?;Px?RU<N~62Oep)
z*bnTmk#26d_=DTKczHigCg*;!>5#*YZJR-c@rC^*dv5lZ<i0n;{WZGl>Fx(P=wE&2
z*GNBBfBn<7XCB)!Cy}>MU$)_6#C;lMjXX%C-aLd;12(_e{j*DqbC~M~oc{qDZz!87
zQ(ZqG7{;yt39>#zL-E2n7$94gcMzedN8U+<gMrTycNdW_6JgiRU^awf{XJC*8wrlQ
zoBC`7283hs9wHPFApfqnDf{*1y;OISNIyu}8s2dG=^(^nl=~y({U3m=hY2Q}{ze`{
zkQbMR|0&m?Fo9?WUy|HD2Z^C`>kP$4MpNoT=N2JG2dmozoTT19aJ~uuwjFRH58><D
zcbTQ6*W+J|M>$MpQ<jn)Xf<#TN%@Bj;LI(ly)*#GNNSLuBsI7{^D>K8kOk=4fU6wC
z*KLUJEiWJHL7`V%R*=7F4{D2P+%#q6UwDjCn8y8=C2)_nlv>QT3!)gNYvnLacS^YW
zM}C2l8J7aHH;UPD2gUH07XVYfX(|NBGQvE-Y$7ZOT;~G<EpLJXhXnp?MEz4@y1%b&
z*9FjhbkoXq^jC(QWME}GhgLR;8K<DdcfUHobF#XhY+jvEaFcayUcv@OdC351k%7h6
zO)q|T=(>r+oi1IDuYU8%)fcX;T>9-`Zc<S>=s>t+QS4rGMMdMdBg!=Eeh|N3kT;`y
zB^8G!Y|MO3!jZ{YntBlURxUla`uwX`f3bY^^5ZK{KR0+869XTk2KOc4lMI0qG|Ci6
z(wiZ4<<iq@k9}?RiOVbB`jPw~$u^1H3R0OK0KFlAV+`a;C@_mm-24T&?c2ECDbXkd
zWl^49k#uA&zUq)B)#>fddEC43{Y)HuG1k2;%vFjpeDSkk1yPX6U=-P%1xM2RA4#`2
z3~o{Se(3scdMgv@NXl>r!_$dKU65^(+JLs9P;Dd*)#A{$aR%=*9K2Uk{AbZ?9nm(>
zEJij{9l_UBO@wGB?qkfiGC(on`1_X4f!^EUnXMJH^`01Ki=LDkZFL)CYw{~t+40J*
zC@VZHw=;VNZ_oI}1ixO0W|C@t(K0KXMu)ZK&(eD|$!>8x5kZqPyRiN~O_I;$XI3rs
zFZpKq;>(XcvrPh=$+FAlGr?}0!uF`dFL(xKloX#<b8&St4k2$e+MgfSWbXWIy&Ig7
ze2VDc^9v2WS>oJKQrIgA!g=Qdu{J+S4!G?j7{1$dK7mK4_~e31NH+1+4#fYurfO==
SW}0F8ai%vjJ;d}@qW=Zd(!Ndr

diff --git a/polls/views/__pycache__/notice.cpython-38.pyc b/polls/views/__pycache__/notice.cpython-38.pyc
index 569da4a2905577e33176348c37b8c2aa6c2c2feb..4bebd61725cd2b33a98311bb9e57929cb4d7d251 100644
GIT binary patch
delta 2826
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
Up>KtVcrP_%oL7lTLVFPZ0U}RtrvLx|

delta 2446
zcmbtWNo*WN6z%Gn>FMcZ7SCckHnHQ_PR1r)5)x$>n<KHrgxJAg2%}-D<IH$ASNE6%
zjhTbFL<q@Nao~WEa|}l!aY9HraAAo8#}bi%n{Pxy91ueMUp-0eD3O8~sh|G;RsYxD
z>esA~|GY1H&bAE&e(!wsS1vQW9_=N+tdDk^mEe4kC{&?=^7<>?(fJ6FTG^<W^CnT&
zmj_#p=9tu=<_F3uStauwlDDYc=97|-(pZ~MNj^>!Z9Xme4w`K98Of(;y3Kb=K0`a(
zd>0MPDA}$}bTvzac6~qjgperzPVG+wKqi6>*I_IUB-8odYR|C*k{!4dF1k79<S9!d
zr@J1z;1w&5(DL=VQ>82j;%k}+GiRycz-pYI4eTZ(d^s=^8iqBS-wX_qVg5(p#()Vt
zvk+{6Q(2Y8kl6*WiFpL&pMrZvx{>Tb7(^Jk2ctj<qgwNd1t;g#>iv9gXo&3N)1fal
z-z+z@;Z`SXyGCR<vn-0*8Gx+CdXdI}*%JsdUi3)>793AT!gO5NiGW^-pqpQISOmyy
zkPV?2l|-cNLy@v^6mD}drU(-=mh(3q;9qOI$)W4NX-Cv&w`YJ&pz<UF`pott$OH63
z-g6de?6NEZOTxk?!BvBwk5oy5e;=8I0{#=}ok^is7AM@OQ&6L`e!P8K;>9X$iR}Qg
z{RlD#_o^*}W*V;;J*1CcF?O|%!zN+nX{A`rxnACDxNJA-J&l0575W0JHR`z{72&G$
zt_y_ph7I737ZIL9kU2E`93Di0OxzxzgmKoXmoJ~LQK!sKpny~asS8pS+7NZTe6hSe
z!HTebaXZ6PeA=w^zX6&B%+cK+_88{-Ir!XLD*ut}<R6B12G`X0O1#I)lF#^*)kg-o
zW0hJ><9X%$$cpKOH_}bBq?Q8BKq&*C37-XDCwwsqckZfAl%+qbrKScNM_0nla4Ak>
zi|QI-r)a7f&c&PIjl@-jD00P?D|=~r>&hBg+Utc&dMPTc#y{d^yO&(zSM0uS%j;_1
zJ<whafElZlKnM5@`$UT@{SLIf5^9F138qzc#!GIbt|}{r4B^Sg4Pi}P8UPzRq>Yas
z*TzIU4@ugAc>p69JdMJnq2W)}RWhf{D0516FsOLliv~FNEx#S=JJK`F#-IrIuRfC<
z@UZTeW8esE7Gys=%%6#+JEwu0736>*6HMNLV`wYGE3vNEPXc+32;1-c+=Zf3rmi3d
zvpcpl|MttyWb;38Av84k62i*}r}^zz=V%|2cshF(LAEhY1%^%vtL!X0<;k498+<ID
zX~}sRl0JyA3yte}%<p^q{_OBWm(4#5X6B80-gR@!`EtXN&Cgy#<F<dP{0ZW+Iozqq
zlOVc0I|uxOcfw3aOTNncu)+O;{~A9=biON*RP_KqoS5*Lu&x?J_i0^MQzTB<;`PrH
zKajcqTqbrHU3n8h*5)mw&LhYwy$uwMBYrd4^#az4<pHvp|5=>zRCnu<#kq*bEFj2{
zV?H|d7IR8Y!Fw?Itcc2(@`vWxmRb?7J$%05w^HXwg%76-t?knt-?uYpMfMCnL2}Ax
zBM*)K{=<WjiBO@|sQPbGHsFUKZB^0Cw&z9>$wpPaH(bwHQ+Hs4iw&v-41#4&5mo~(
z+b!a>l&>z-#@vfF<`o*A%T!npW?OvG^XmTV803qYfn;dwBE0r4JPaF|{>d=N=dF6J
zTz1DQIJ8~)vWQIEPNBw}G3Qdjse8p*)nyTWCzF|$7aRW&uzd)J5O8F(MT80hy16Ab
g8RaO*gnk^(X_TFl*kbNc06y0_ZceF0CDsVyzu`0tH2?qr

diff --git a/polls/views/__pycache__/task.cpython-38.pyc b/polls/views/__pycache__/task.cpython-38.pyc
index 5bcf9fe41c0e1139d22f1dd26f63b6725505930b..2ff5b5b6308c8cd866e22ae865c984077d599a3a 100644
GIT binary patch
delta 1112
zcmZ9K%WD%+6vlHh$xL2TlQz#LGbw4cO@d7yidu!LRHz6RU#*=|($ty8)TAkQl0_j!
zF|L%N<?2Ex3Ze_$R4D!jZrq9B!r3bpH?CX=qW9dCwwT3_?>z3EbH3akiD!y@O_n`2
z_PhW0cfPSMEAVkWyE0h`YhkeIHr-v0RH9n664PRpPOTGchG@8TkM6x^YeEyWIFEh0
zyb~vQ+@>Gci4{ZC{dxc+O<n)>3LJC;`n;CgG?w&yZE4xudJnSz5t<UR5TzG|F6g9H
zAuPt(P(+~*1eK-V2pJfnpM^`1rM-?E<CH^z7xa`nP9Hh`MDDEmYr#d&VyNNQJJw(|
z&<Kp#W*6v7=T%=#X|yk@MQ8|3JN@NMdP8_~7!jvkVk(wI*~yT$Tb>)lDAWu+Kfl7N
zGh%M^7%OZ8Rs}MGohK2;F>C)XYdK4mLeWTr<t&nFefc$zDE%OgM<RGc#qK0Yp%xI`
zv`<Q?K_)GsXw--UmBduJWY&lqTYBiclwtd?Nr#i|m^g?CAUY6d5&ZTT{UWKO#Lp6z
zt8N-(sZcS}L6X6aZp=!{q`FWl8-zQH`?mJM1^GVY1nqTACr7c_iC35w)X4yrhjuYc
zpSwb^K;O9x(GOuDlUu603FEj1*>%>EY6bIFzNC|*EMNCAe0_NL+mpB3kDq?u+$7xc
z(|9C`h#~kyak}kMMZVS)mA#6{mpelTyz$!!>{1Zi%EW#vG0U$yg6bRs?c8w@)gc7`
zMlUKE(TCu6Tt_v{V99$g0Oy~<0-xuK7bX7#xc6fi^2s$+e6TcAX}M)OA7=_nBZz)P
z4#6EAL^VSdUqqcixzAx1S}yhs^623Nz3e*=dAi{n?B-tZ-GOhHhSrz%ouxm0p>~tq
zVA>gM5}9L6Cuv0fbb&t(&94{CoAcEI(fcb^-6)%_=fqzZ-z&>bkV!-yF^Aau0$0N{
V*VYq_LQt@S9ehE~3}?y?{{Yod<U#-d

delta 1168
zcmZ9L&rcIU6vubEWtaX~Xl3ay+KPbME#XH|Q8WrhP&7({6opMnQ<y~-Tfy0qNCINS
zt5Gs|(1UvM;sqlo{{=NM(c9iklt{dLFfno7Y!$*L^XZ%SX6C*3o$2$$&$u$GC|-em
zZ+k!F`__~M`ncA*cohj)z@B2L6xPF~h#o0L^(Yby$?#w=_B{|*(JInoeD23eW!}K&
zHMq7ij~fyW;2_NO#M<vyNTe@OYV!-qArzt+u@!}BPHaR`dRGidF;)bL(`RCmx!;Lt
zl%e0mVU(ub?vBPZ3r-=Zv+}9zS7zfJ8`e6aL062vaQ_LD<v>}T_0HBW1#sO%v>aRt
z_6xZ&x>=P?Jw~_FY^Y@!hjGMYEsO|SbjTJj3}gu$Na_JGdRl6VCc%s{XfE43MT|n(
z!1>8V7QG{Nq`FyP8|u+S(gQ0`0*-^%wcATSNg>wGmNYmVf)xn}CddJ>ML-jSUAtfz
zWS-1Tn?)mU8D+a_+9Xz))Im_ZVU&p*ESXtFlleWcvze~QX?FH&xov+C94&wVU?1Qt
zfG3U6UvjcjQ;7yHo>8u3BV2W8(`f_x;%$%<bfkLx*cmprtDro~Mhm0^!kPc*f~e0C
zCtogDH=CKm!t`sk;f^4Z-Ms8sMT5}Aj=Z)E3-cx>N11=Y&+z@x{jDc&w%4Ej*w`Rk
z_g>f%21Ee7z8DSrk`nJ~l%Db>B;H#eo$xiRG{CAjfD0VoBd~MS5s3E#K+TGXU>yYT
z9EZSC0EYowoNHiRXRwu>X8`q&Lx9(_;scZG&!vY)=~O-j7B4KtEKPB)fOj?up&mdR
zpdG;V?F0)Bw-K??yzVot{Iq$?v}O!Uu0U|l4ODyB!{GW4(R==jC`aG>GncqLTn@w=
z){v8Y&*s3t>oY9p48k&4@Q4MOOfYImI-q<$uLp3!nwgv{5Zqpx!$#3^-Wq>;yleQ6
hk}MzxfW5ma<!QU<WKBy%MXKmRF637^HO?j%`U_4u^0xp0

diff --git a/polls/views/media.py b/polls/views/media.py
index b2a7df1..2a75c2a 100644
--- a/polls/views/media.py
+++ b/polls/views/media.py
@@ -1,3 +1,4 @@
+from polls.utils import send_tnps
 from django.http import HttpResponse, JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.core.paginator import Paginator
@@ -80,17 +81,22 @@ def create_media(request):
     instance.save()
     if o.is_direct():
         admins = Userprofile.level1_admin()
+        content = '%s创建了新媒体，请审核' % (profile,)
+        phones = []
         for a in admins:
-            content = '%s创建了新媒体，请审核' % (profile,)
+            phones.append(a.user.username)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '3', '0')
+        send_tnps(phones, content)
     else:
         admins = Userprofile.level2_admin(instance.organization.cities)
+        content = '%s创建了新媒体，请审核' % (profile,)
+        phones = []
         for a in admins:
-            content = '%s创建了新媒体，请审核' % (profile,)
+            phones.append(a.user.username)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '2', '0')
-
+        send_tnps(phones, content)
     return JsonResponse({'status': 'success'})
 
 
@@ -228,19 +234,24 @@ def delete_media(request):
         instance.status = 5
         instance.save()
         managers = Userprofile.level1_admin()
+        content = '%s申请注销新媒体，请审核' % (profile,)
+        phones = []
         for a in managers:
-            content = '%s申请注销新媒体，请审核' % (profile,)
+            phones.append(a.user.username)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '0', '3')
+        send_tnps(phones, content)
     else:
         instance.status = 4
         instance.save()
         managers = Userprofile.level2_admin(instance.organization.cities)
+        content = '%s申请注销新媒体，请审核' % (profile,)
+        phones = []
         for a in managers:
-            content = '%s申请注销新媒体，请审核' % (profile,)
+            phones.append(a.user.username)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '5', '3')
-
+        send_tnps(phones, content)
     admins = []
     for admin in instance.organization.userprofile_set.all():
         u = dict()
@@ -292,10 +303,13 @@ def media_admin_change(request):
         profile.admin_status = 5
         profile.save()
         managers = Userprofile.level1_admin()
+        content = '%s申请变更管理员，请审核' % (operator,)
+        phones = []
         for a in managers:
-            content = '%s申请变更管理员，请审核' % (operator,)
+            phones.append(a.user.username)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', 'Userprofile', 'admin_status', o.id, '3', '0')
+        send_tnps(phones, content)
         return JsonResponse({'status': 'success', 'message': '变更申请发送成功'})
     else:
         obj, created = UserModel.objects.get_or_create(
@@ -309,8 +323,11 @@ def media_admin_change(request):
         profile.admin_status = 4
         profile.save()
         managers = Userprofile.level2_admin(o.cities)
+        content = '%s申请变更管理员，请审核' % (operator,)
+        phones = []
         for a in managers:
-            content = '%s申请变更管理员，请审核' % (operator,)
+            phones.append(a.user.username)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', 'Userprofile', 'admin_status', o.id, '2', '0')
+        send_tnps(phones, content)
         return JsonResponse({'status': 'success', 'message': '变更申请发送成功'})
diff --git a/polls/views/notice.py b/polls/views/notice.py
index 76d0a67..6a9eb7d 100644
--- a/polls/views/notice.py
+++ b/polls/views/notice.py
@@ -1,3 +1,4 @@
+from polls.utils import send_tnps
 from django.shortcuts import render
 from django.http import HttpResponse, JsonResponse
 from django.views.decorators.csrf import csrf_exempt
@@ -152,9 +153,12 @@ def pass_notice(request):
                     n.is_read = True
                     n.save()
                 admins = Userprofile.level1_admin()
+                phones = []
                 for a in admins:
+                    phones.append(a.user.username)
                     Notice.create_reply_notice(
                         a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '3', '0')
+                send_tnps(phones, notice.content)
             else:  # 省级提交
                 for p in profiles:
                     if p.admin_status == 5:
@@ -181,14 +185,20 @@ def pass_notice(request):
             pass_value = notice.record_pass_value
             if pass_value == '2':
                 admins = Userprofile.level1_admin()
+                phones = []
                 for a in admins:
+                    phones.append(a.user.username)
                     Notice.create_reply_notice(
                         a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '3', '0')
+                send_tnps(phones, notice.content)
             if pass_value == '5':
                 admins = Userprofile.level1_admin()
+                phones = []
                 for a in admins:
+                    phones.append(a.user.username)
                     Notice.create_reply_notice(
                         a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '0', '3')
+                send_tnps(phones, notice.content)
             return JsonResponse({'status': 'success', 'message': '申请已同意'})
     except ObjectDoesNotExist:
         return JsonResponse({'status': 'error', 'message': '通知ID错误'})
diff --git a/polls/views/task.py b/polls/views/task.py
index 5c61416..8398ec6 100644
--- a/polls/views/task.py
+++ b/polls/views/task.py
@@ -6,7 +6,7 @@ import datetime
 from polls.decorators import polls_login_required
 from polls.models import Message, Notice, Task, TaskAddition, TaskRecord
 from django.core.exceptions import ObjectDoesNotExist
-from polls.utils import model_to_dict, queryset_to_list, parse
+from polls.utils import model_to_dict, queryset_to_list, parse, send_tnps
 from dashboard.models import Group, Group_user, Userprofile
 
 
@@ -72,6 +72,7 @@ def create_task(request):
             if profile and profile.status == 1:
                 content = '%s在群组“%s”发布了任务，请查收消息' % (profile, g.name)
                 Notice.create_normal_notice(u.user_id, content, group)
+                send_tnps([u.username], content)
     return JsonResponse({'status': 'success'})