no commit message

webmain/task/api/asynrunAction.php

@@ -63,12 +63,13 @@ class asynrunClassAction extends apiAction
 		return m('flow')->initflow('hrsalary', $id)->todouser();
 	}
 	
-	//下载微信发送的图片到服务器
+	//下载微信发送的图片到服务器(弃用)
 	public function downwxpicAction()
 	{
-		$picurl = $this->rock->jm->uncrypt($this->get('picurl'));
-		$msgid  = $this->get('msgid');
-		return m('reim')->downwximg($picurl, $msgid);
+		//$picurl = $this->rock->jm->uncrypt($this->get('picurl'));
+		//$msgid  = $this->get('msgid');
+		//return m('reim')->downwximg($picurl, $msgid);
+		return 'noturl';
 	}
 	
 	//下载微信上媒体文件

webmain/task/api/uploadAction.php

@@ -476,6 +476,7 @@ class uploadClassAction extends apiAction
 	{
 		$data = array();
 		$fenlei = $this->jm->base64decode($this->get('fenlei'));
+		$fenlei = $this->rock->xssrepstr($this->rock->iconvsql($fenlei));
 		$where 	= m('admin')->getjoinstr('a.`receid`', $this->adminid, 1);
 		$sql 	= 'select a.`name`,a.`wtype`,b.`filepath`,b.`id` from `[Q]wordxie` a left join `[Q]file` b on a.`fileid`=b.`id` where a.`fenlei`=\''.$fenlei.'\' and a.`isgk`=1 and ('.$where.')';
 		$rows 	= $this->db->getall($sql);