Browse Source

add to local

stanley-king 7 years ago
parent
commit
a03edb5abb
3 changed files with 39 additions and 22 deletions
  1. 19 5
      admin/control/oper_sms.php
  2. 6 6
      admin/templates/default/oper_send.awaken.php
  3. 14 11
      qwatch.py

+ 19 - 5
admin/control/oper_sms.php

@@ -102,14 +102,28 @@ class oper_smsControl extends SystemControl
         }
     }
 
-    public function awaken_userOp(){
-        if(chksubmit()){
-            $dates = $_POST['dates'];
-            $paysn = $_POST['paysn'];
-            $ex_lrlz = $_POST['ex_lrlz'];
+    public function awaken_userOp()
+    {
+        if(chksubmit())
+        {
+
         }
         else {
             Tpl::showpage('oper_send.awaken');
         }
     }
+
+    public function bonus_awakenOp()
+    {
+        $days = intval($_POST['days']);
+        $paysn = $_POST['paysn'];
+        $amount = floatval($_POST['amount']);
+        if(empty($paysn)) {
+            showMessage("参数错误,paysn 不能为空",'index.php?act=oper_sms&op=awaken_user','','error');
+        }
+        else {
+            QueueClient::push('onAsyncBroadcastOrder',['pay_sn' => $paysn,'amount' => $amount,'days' => $days]);
+            showMessage("成功放入推送队列", 'ndex.php?act=oper_sms&op=awaken_user');
+        }
+    }
 }

+ 6 - 6
admin/templates/default/oper_send.awaken.php

@@ -31,16 +31,16 @@
         </tr>
         </tbody>
     </table>
-    <form id="points_form" class="form" method="post" name="form1">
+    <form id="points_form" class="form" method="post" action="index.php?act=oper_sms&op=bonus_awaken" name="form1">
         <input type="hidden" name="form_submit" value="ok"/>
         <table class="table tb-type2 nobdb">
             <tbody>
                     <tr>
-                        <td class="required">根据订单发红包雨:</td>
-                        <td><label>paysn:<input class="w400" type="text" name="paysn" placeholder="请输入paysn"></label></td>
-                        <td><label>最近多少天注册用户:<input type="text" name="days" placeholder="请输入时间"></label></td>
-                        <td><label>金额:<input type="text" name="amount" placeholder="请输入金额"></label></td>
-                        <td><a href="JavaScript:void(0);" class="submit_btn btn" id="submit_form"><span><?php echo $lang['nc_submit']; ?></span></a></td>
+                        <td class="w120 align-left">根据订单发红包雨:</td>
+                        <td class="w400 align-left"><label>paysn:<input class="w300" type="text" name="paysn" placeholder="请输入paysn"></label></td>
+                        <td class="w200 align-left"><label>金额:<input type="text" name="amount" placeholder="单个用户红包金额"></label></td>
+                        <td class="w250 align-left"><label>最近多少天注册用户:<input type="text" name="days" placeholder="请输入天数"></label></td>
+                        <td class="w200 align-left"><a href="JavaScript:void(0);" class="submit_btn btn" id="submit_form"><span><?php echo $lang['nc_submit']; ?></span></a></td>
                     </tr>
             </tbody>
         </table>

+ 14 - 11
qwatch.py

@@ -125,19 +125,22 @@ def main():
 		cmds = ["php", "./crontab.php", "queue", "index"]
 	else:
 		cmds = ["/usr/local/php/bin/php", "./crontab.php", "queue", "index"]
-	while shutdown == False :
-		for i in range(0,10):
-			subproc = subprocess.Popen(cmds,close_fds=True,stdin=None,stdout=None,stderr=None)
-			queue_process.append(subproc)
-			print "create queue process pid=", subproc.pid
 
+	for i in range(0, 10):
+		subproc = subprocess.Popen(cmds, close_fds=True, stdin=None, stdout=None, stderr=None)
+		queue_process.append(subproc)
+		print "create queue process pid=", subproc.pid
+
+	while shutdown == False :
+		time.sleep(1)
 		for process in queue_process:
-			print "im waiting pid=", process.pid
-			process.wait()
-			# ret = process.poll()
-			# print "poll return code=", ret
-			queue_process.remove(process)
-		print "all sub process has quited."
+			if process.poll() is not None:
+				print process.pid, " is dead."
+				queue_process.remove(process)
+				child = subprocess.Popen(cmds, close_fds=True, stdin=None, stdout=None, stderr=None)
+				print "create queue process pid=", child.pid
+				queue_process.append(child)
+
 
 if __name__ == '__main__':
 	main()