no commit message

webmain/task/api/kaoqinAction.php

@@ -52,6 +52,29 @@ class kaoqinClassAction extends apiAction
 		$this->showreturn($barr);
 	}
 	
+	/**
+	*	获取定位的URL
+	*/
+	//private $dwurl = 'http://127.0.0.1/app/rockfile/index.php?m=dingwei';
+	private $dwurl = 'aHR0cHM6Ly9maWxlLnJvY2tvYS5jb20vaW5kZXgucGhwP209ZGluZ3dlaQ::';
+	public function dwurlAction()
+	{
+		$dwrand 	= $this->get('dwrand');
+		return returnsuccess(array(
+			'url' 	 => $this->jm->base64decode($this->dwurl).'&dwrand='.$dwrand.'',
+			'dwrand' => $dwrand
+		));
+	}
+	
+	public function dwgetAction()
+	{
+		$dwrand 	= $this->get('dwrand');
+		$url 		= $this->jm->base64decode($this->dwurl).'&a=getdw&dwrand='.$dwrand.'';
+		$cont 		= c('curl')->getcurl($url);
+		if(!$cont)$cont = returnerror('无法获取');
+		return $cont;
+	}
+	
 
 	
 	/**

webmain/task/api/rockkefuAction.php

@@ -0,0 +1,28 @@
+<?php
+/**
+*	客服
+*/
+
+class rockkefuClassAction extends apiAction
+{
+	
+	public function initAction()
+	{
+		parent::initAction();
+		$type   = @$_SERVER['REQUEST_METHOD'];
+		$cans	= $_GET;
+		$cans['user'] = $this->userrs['user'];
+		unset($cans['m']);
+		unset($cans['a']);
+		
+		$url 	= c('rockkefu')->geturlstr('openkefu',A, $cans);
+		if($type=='POST'){
+			$result = c('curl')->postcurl($url, $_POST);
+		}else{
+			$result = c('curl')->getcurl($url);
+		}
+		if(!$result)$result = json_encode(returnerror('无法访问'));
+		echo $result;
+		exit;
+	}
+}

webmain/task/api/uploadAction.php

@@ -276,6 +276,7 @@ class uploadClassAction extends apiAction
 		return $this->fileinfoShow($fileid, $type, $ismobile);
 	}
 	
+	private $frs,$loadyuan;
 	public function fileinfoShow($fileid, $type, $ismobile)
 	{
 		$fobj 	= m('file');