Merge branch 'v3.0-app' of http://118.190.145.217:3000/xiaojincai/wanzb_v3_api into v3.0-app

src/manage/controls.py

@@ -865,7 +865,8 @@ def reply_wanzhu_consult(**kwargs):
         title = u"顽主杯"
         body = u"你收到一条顽主的消息"
         params = {"type":"message","id":str(user_id)}
-        aliyunpush.push_notice_by_userid(user_id,title,body,params)
+        aliyunpush.push_notice_by_userid(user_id,title,body,params,"ios")
+        aliyunpush.push_notice_by_userid(user_id,title,body,params,"android")
 
 def update_player_type(**kwargs):
     """
@@ -1047,4 +1048,5 @@ def push_article(**kwargs):
     body = article.name
     user_id = "ALL"
     params = {"type":"article","id":_id}
-    aliyunpush.push_notice_by_userid(user_id,title,body,params)
+    aliyunpush.push_notice_by_userid(user_id,title,body,params,"ios")
+    aliyunpush.push_notice_by_userid(user_id,title,body,params,"android")

src/utils/aliyunpush.py

@@ -1,9 +1,9 @@
 #-*-coding:utf-8 -*-
-
 from aliyunsdkcore.client import AcsClient
 from aliyunsdkcore.acs_exception.exceptions import ClientException
 from aliyunsdkcore.acs_exception.exceptions import ServerException
 from aliyunsdkpush.request.v20160801.PushRequest import PushRequest
+from aliyunsdkpush.request.v20160801.PushNoticeToAndroidRequest import PushNoticeToAndroidRequest
 
 class AliyunPush(object):
     def __init__(self):
@@ -11,15 +11,21 @@ class AliyunPush(object):
         self.ACCESSKEYSECRET = "OdGWSBRjkJxaPjgmE38eQ8nzkI6nRk"
         self.REGIONID = "cn-shenzhen"
         self.client = AcsClient(self.ACCESSKEYID,self.ACCESSKEYSECRET,self.REGIONID)
-        self.request = PushRequest()
-        self.request.set_accept_format("json")
-        self.request.set_iOSApnsEnv('DEV')
-        self.request.set_AppKey("333793060")
-        print(dir(self.request),1111111111)
 
-    def push_notice_by_userid(self,user_id,title,body,params):
-        self.request.set_PushType("NOTICE")
-        self.request.set_DeviceType("ALL")
+    def push_notice_by_userid(self,user_id,title,body,params,platform):
+        if platform == "ios":
+            self.request = PushRequest()
+            self.request.set_AppKey("333793060")
+            self.request.set_iOSApnsEnv('DEV')
+            self.request.set_iOSExtParameters(params)
+            self.request.set_PushType("NOTICE")
+
+            self.request.set_DeviceType("ALL")
+        else:
+            self.request = PushNoticeToAndroidRequest()
+            self.request.set_AppKey("333793063")
+            self.request.set_ExtParameters(params)
+
         if user_id == "ALL":
             self.request.set_Target("ALL")
             self.request.set_TargetValue("ALL")
@@ -27,9 +33,10 @@ class AliyunPush(object):
             self.request.set_Target("ACCOUNT")
             self.request.set_TargetValue(str(user_id))
 
+        self.request.set_accept_format("json")
         self.request.set_Body(body)
         self.request.set_Title(title)
-        self.request.set_iOSExtParameters(params)
+
         response = self.client.do_action_with_exception(self.request)
         return response
 
@@ -37,10 +44,11 @@ aliyunpush = AliyunPush()
 
 
 if __name__ == "__main__":
+    user_id = 15103
     user_id = 6209
     title = "测试"
     body = "测试"
     params = {"type":"message","id":user_id}
-    res = aliyunpush.push_notice_by_userid(user_id,title,body,params)
+    res = aliyunpush.push_notice_by_userid(user_id,title,body,params,"ios")
     print(params,res)
 

src/weixin/controls.py

@@ -2308,7 +2308,8 @@ def add_wanzhu_consult(request):
     title = u"顽主杯"
     body = u"你收到一条顽主的消息"
     params = {"type":"message","id":str(user_id)}
-    aliyunpush.push_notice_by_userid(0,title,body,params)
+    aliyunpush.push_notice_by_userid(0,title,body,params,"ios")
+    aliyunpush.push_notice_by_userid(0,title,body,params,"android")
 
 
 
@@ -2939,4 +2940,5 @@ def reply_wanzhu_consult(**kwargs):
         title = u"顽主杯"
         body = u"你收到一条顽主的消息"
         params = {"type":"message","id":str(user_id)}
-        aliyunpush.push_notice_by_userid(user_id,title,body,params)
+        aliyunpush.push_notice_by_userid(user_id,title,body,params,"ios")
+        aliyunpush.push_notice_by_userid(user_id,title,body,params,"android")