1.0.3

数据库升级逻辑
视频预览支持弹幕
2024-04-21 12:31:40 +00:00 · 2018-03-11 11:42:38 +08:00 · 2018-03-11 11:39:33 +08:00 · 2018-03-09 21:01:40 +08:00 · 2018-03-08 22:44:06 +08:00 · 2018-03-08 22:43:18 +08:00
51 changed files with 2884 additions and 1996 deletions
@@ -6,3 +6,4 @@
  RewriteCond %{REQUEST_FILENAME} !-f
  RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L]
 </IfModule>
+SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 
@@ -0,0 +1,7 @@
+language: php
+php:
+  - 7.1
+before_script:
+  - composer install
+  - chmod +x ./deploy.sh
+script: ./deploy.sh
@@ -60,6 +60,7 @@ class Installer{
 		$ioContext->write("IMPORTANT! You may still have to configure the URL Rewrite to set everthing to work.");
 		$ioContext->write("Refer to the install manual for more informatioin.");
 		$ioContext->write("=======================");
+		self::sendFeedBack($siteUrl);
 	}

 	 public static function writrConfig(Event $event,$sqlInfo){
@@ -86,7 +87,7 @@ class Installer{
 		$hostname=$ioContext->ask("Input the hostname of your MySQL server (Default:127.0.0.1):","127.0.0.1");
 		$database=$ioContext->ask("The database name:","127.0.0.1");
 		$username=$ioContext->ask("The username of your MySQL server (Default:root):","root");
-		$password=$ioContext->askAndHideAnswer("The password of your MySQL server:");
+		$password=$ioContext->ask("The password of your MySQL server:");
 		$hostport=$ioContext->ask("The hostport of your MySQL server (Default:3306):","3306");
 		$mysqli = @new \mysqli($hostname, $username,  $password,  $database,  $hostport);
 		if ($mysqli->connect_error) {
@@ -105,5 +106,9 @@ class Installer{
 		];
 	}

+	public static function sendFeedBack($url){
+		@file_get_contents("http://aoaoao.me/api/feedback.php?url=".urlencode($url));
+	}
+
 }
 ?>
@@ -6,13 +6,15 @@ Cloudreve - Make the cloud easy for everyone
 [![Latest Unstable Version](https://poser.pugx.org/hfo4/cloudreve/v/unstable)](https://packagist.org/packages/hfo4/cloudreve)
 [![License](https://poser.pugx.org/hfo4/cloudreve/license)](https://packagist.org/packages/hfo4/cloudreve)

+[主页](https://cloudreve.org) | [论坛](https://forum.cloudreve.org) | [演示站](https://pan.aoaoao.me) | |[Telegram群组](https://github.com/HFO4/Cloudreve)
+
 基于ThinkPHP构建的网盘系统，能够助您以较低成本快速搭建起公私兼备的网盘。

 ![homepage.png](https://download.aoaoao.me/homepage.png)

 目前已经实现的特性：

-* 快速对接多家云存储，支持七牛、又拍云、阿里云OSS、AWS S3，当然，还有本地存储
+* 快速对接多家云存储，支持七牛、又拍云、阿里云OSS、AWS S3、自建远程服务器，当然，还有本地存储
 * 可限制单文件最大大小、MIMEType、文件后缀、用户可用容量
 * 图片、音频、视频、文本、Markdown、Ofiice文档 在线预览
 * 移动端全站响应式布局
@@ -22,7 +24,7 @@ Cloudreve - Make the cloud easy for everyone
 * 初步完善的后台，方便管理
 * 拖拽上传、分片上传、断点续传、下载限速（*实验性功能）
 * 多上传策略，可为不同用户组分配不同策略
-* 用户组基础权限设置
+* 用户组基础权限设置、二步验证
 * WebDAV协议支持

 安装需求
@@ -88,7 +90,7 @@ location / {
 * 到 设置-基础设置 中更改站点URL，如果不更改，程序无法正常接受回调请求
 * 添加Crontab定时任务 ：你的域名/Cron
 * 如果你打算使用本地上传策略并且不准备开启外链功能，请将·public/uploads·目录设置为禁止外部访问
-* 如需启用二步验证功能，请依次执行`composer require phpgangsta/googleauthenticator:dev-master` `composer require endroid/qrcode`安装二步验证支持库
+* 如需启用二步验证功能，请依次执行`composer require phpgangsta/googleauthenticator:dev-master` `composer require endroid/qr-code`安装二步验证支持库
 * 给本项目一个Star~

 文档
@@ -29,12 +29,44 @@ class Admin extends Controller{
 	}

 	public function index(){
+		if($this->adminObj->checkDbVersion()){
+			$this->redirect(url('/Admin/UpdateDb','',''));
+			exit();
+		}
 		return view('admin_index', [
 			'options'  => $this->siteOptions,
 			'statics' => $this->adminObj->getStatics(),
 		]);
 	}

+	public function UpdateDb(){
+		if(!$this->adminObj->checkDbVersion()){
+			$this->redirect(url('/Admin','',''));
+			exit();
+		}
+		echo "<meta charset='utf-8'>";
+		echo "准备升级数据库，当前数据库版本:".$this->adminObj->dbVerInfo["now"];
+		echo ", 目标数据库版本:".$this->adminObj->dbVerInfo["require"].";<br>";
+		$updatePath = ROOT_PATH . "update_".$this->adminObj->dbVerInfo["now"]."to".$this->adminObj->dbVerInfo["require"].".sql";
+		if(!file_exists($updatePath)){
+			die("数据库更新文件(".$updatePath.")不存在，升级中止.");
+		}
+		echo "获取升级SQL文件(".$updatePath.")<br>";
+		$updateContent = file_get_contents($updatePath);
+		echo "将执行以下指令：<br>";
+		echo "<code>".htmlspecialchars($updateContent)."</code><br>";
+		$sqlSingle = explode(";", $updateContent);
+		foreach ($sqlSingle as $key => $value){
+			if(empty($value)){
+				continue;
+			}
+			if(!Db::execute($value)){
+				echo "<strong>执行$value 时出现错误</strong><br>";
+			}
+		}
+		echo "<strong>升级完成,<a href='/Admin'>返回管理面板</a></strong>";
+	}
+
 	public function Setting(){
 		return view('basic_setting', [
 			'options'  => $this->siteOptions,
@@ -120,7 +152,7 @@ class Admin extends Controller{
 	public function SettingOther(){
 		return view('other_setting', [
 			'options'  => $this->siteOptions,
-			'optionsForSet'  =>  Option::getValues(["file_edit","share","avatar","admin","storage_policy"]),
+			'optionsForSet'  =>  Option::getValues(["file_edit","share","avatar","admin","storage_policy","download"]),
 		]);
 	}

@@ -409,6 +441,12 @@ class Admin extends Controller{
 		]);
 	}

+	public function PolicyAddRemote(){
+		return view('add_policy_remote', [
+			'options' => $this->siteOptions,
+		]);
+	}
+
 	public function About(){
 		$verison = json_decode(file_get_contents(ROOT_PATH . "application/version.json"),true);
 		return view('about', [
@@ -81,4 +81,11 @@ class Callback extends Controller{
 		$handllerObj -> s3Handler($callbackKey);
 	}

+	public function Remote(){
+		ob_end_clean();
+		header('Content-Type: application/json');
+		$handllerObj = new CallbackHandler(file_get_contents("php://input"));
+		$handllerObj -> remoteHandler(Request::instance()->header('Authorization'));
+	}
+
 }
@@ -13,6 +13,10 @@ class Index extends Controller{
    public function index(){

    	$this->userObj = new User(cookie('user_id'),cookie('login_key'));
+    	if($this->userObj->loginStatus){
+    		$this->redirect(url('/Home','',''));
+    		exit();
+    	}
    	$userInfo = $this->userObj->getInfo();
    	return view('index', [
    		'options'  => Option::getValues(['basic']),
@@ -7,7 +7,7 @@ use think\Db;
 use \app\index\model\Option;
 use \app\index\model\User;
 use \app\index\model\Directory;
-use \app\index\model\Object;
+use \app\index\model\Objects;
 use \app\index\model\DavAuth;
 use \app\index\model\BasicCallBack;

@@ -14,11 +14,22 @@ class AdminHandler extends Model{
 	public $pageNow;
 	public $pageTotal;
 	public $dataTotal;
+	public $dbVerInfo;
 	
 	public function __construct($options){
 		$this->siteOptions = $options;
 	}

+	public function checkDbVersion(){
+		$versionInfo = json_decode(@file_get_contents(ROOT_PATH. "application/version.json"),true);
+		$dbVerNow = Option::getValue("database_version");
+		if(!isset($versionInfo["db_version"]) || $dbVerNow < (int)$versionInfo["db_version"]){
+			$this->dbVerInfo = array('now' => $dbVerNow, 'require' => $versionInfo["db_version"]);
+			return true;
+		}
+		return false;
+	}
+
 	public function getStatics(){
 		$statics["fileNum"] = Db::name('files')->count();
 		$statics["privateShareNum"] = Db::name('shares')->where("type","private")->count();
@@ -337,7 +348,7 @@ class AdminHandler extends Model{
 	}

 	public function listFile(){
-		$pageSize = empty(cookie('pageSize')) ? 10 : cookie('pageSize');
+		$pageSize = !cookie('?pageSize') ? 10 : cookie('pageSize');
 		$orderType = empty(cookie('orderMethodFile')) ? "id DESC" : cookie('orderMethodFile');
 		$this->pageData = Db::name("files")
 		->where(function ($query) {
@@ -392,7 +403,7 @@ class AdminHandler extends Model{
 	}

 	public function listUser(){
-		$pageSize = empty(cookie('pageSize')) ? 10 : cookie('pageSize');
+		$pageSize = !cookie('?pageSize') ? 10 : cookie('pageSize');
 		$orderType = empty(cookie('orderMethodUser')) ? "id DESC" : cookie('orderMethodUser');
 		$this->pageData = Db::name("users")
 		->where(function ($query) {
@@ -461,7 +472,7 @@ class AdminHandler extends Model{
 	}

 	public function listShare(){
-		$pageSize = empty(cookie('pageSize')) ? 10 : cookie('pageSize');
+		$pageSize = !cookie('?pageSize') ? 10 : cookie('pageSize');
 		$orderType = empty(cookie('orderMethodShare')) ? "id DESC" : cookie('orderMethodShare');
 		$this->pageData = Db::name("shares")
 		->where(function ($query) {
@@ -506,7 +517,7 @@ class AdminHandler extends Model{
 	}

 	public function listPolicy(){
-		$pageSize = empty(cookie('pageSize')) ? 10 : cookie('pageSize');
+		$pageSize =!cookie('?pageSize') ? 10 : cookie('pageSize');
 		$this->pageData = Db::name("policy")
 		->where(function ($query) {
 			if(!empty(cookie('policySearch'))){
@@ -0,0 +1,72 @@
+<?php
+namespace app\index\model;
+
+use think\Model;
+use think\Db;
+use \app\index\model\Option;
+
+class B2 extends Model{
+
+	public $policy;
+	private $ak;
+
+	public function __construct($policy){
+		$this->policy = $policy;
+		$akInfo = explode(":",$this->policy["ak"]);
+		$this->ak = $akInfo[0];
+		if(time()-$akInfo[1]>=86000){
+			$this->updateAuth();
+		}
+	}
+
+	private function updateAuth(){
+		$credentials = base64_encode($this->ak . ":" . $this->policy["sk"]);
+		$url = "https://api.backblazeb2.com/b2api/v1/b2_authorize_account";
+		$session = curl_init($url);
+		$headers = array();
+		$headers[] = "Accept: application/json";
+		$headers[] = "Authorization: Basic " . $credentials;
+		curl_setopt($session, CURLOPT_HTTPHEADER, $headers); 
+		curl_setopt($session, CURLOPT_HTTPGET, true); 
+		curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($session, CURLOPT_SSL_VERIFYPEER, false); //不验证证书
+		curl_setopt($session, CURLOPT_SSL_VERIFYHOST, false); //不验证证书
+		$server_output = curl_exec($session);
+		curl_close ($session);
+		$authInfo = json_decode($server_output,true);
+		Db::name("policy")->where("id",$this->policy["id"])
+		->update([
+			"ak" => $this->ak . ":" . time(),
+			"op_name" => $authInfo["apiUrl"],
+			"url" => $authInfo["downloadUrl"],
+			"op_pwd" => $authInfo["authorizationToken"],
+			]);
+		$this->policy = Db::name("policy")->where("id",$this->policy["id"])->find();
+		$this->updateUploadAuth();
+	}
+
+	private function updateUploadAuth(){
+		$session = curl_init($this->policy["op_name"] .  "/b2api/v1/b2_get_upload_url");
+		$data = array("bucketId" => $this->policy["bucketname"]);
+		$post_fields = json_encode($data);
+		curl_setopt($session, CURLOPT_POSTFIELDS, $post_fields); 
+		$headers = array();
+		$headers[] = "Authorization: " . $this->policy["op_pwd"];
+		curl_setopt($session, CURLOPT_HTTPHEADER, $headers); 
+		curl_setopt($session, CURLOPT_SSL_VERIFYPEER, false); //不验证证书
+		curl_setopt($session, CURLOPT_SSL_VERIFYHOST, false); //不验证证书
+		curl_setopt($session, CURLOPT_POST, true);
+		curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
+		$server_output = curl_exec($session);
+		curl_close ($session);
+		$authInfo = json_decode($server_output,true);
+		Db::name("policy")->where("id",$this->policy["id"])
+		->update([
+			"server" => $authInfo["uploadUrl"] . "|" .  $authInfo["authorizationToken"],
+			]);
+		$this->policy = Db::name("policy")->where("id",$this->policy["id"])->find();
+		die("");
+	}
+
+}
+?>
@@ -20,6 +20,28 @@ class CallbackHandler extends Model{
 		$this->CallbackData = $data;
 	}

+	public function remoteHandler($header){
+		$jsonData = json_decode(base64_decode($this->CallbackData),true);
+		$CallbackSqlData = Db::name('callback')->where('callback_key',$jsonData['callbackkey'])->find();
+		$this->policyData = Db::name('policy')->where('id',$CallbackSqlData['pid'])->find();
+		if(!$this->IsRemoteCallback($header)){
+			$this->setError("Undelegated Request");
+		}
+		if($this->policyData == null){
+			$this->setError("CallbackKey Not Exist.");
+		}
+		if(!FileManage::sotrageCheck($CallbackSqlData["uid"],$jsonData["fsize"])){
+			$this->setError("空间容量不足",true);
+		}
+		$picInfo = $jsonData["picinfo"];
+		$addAction = FileManage::addFile($jsonData,$this->policyData,$CallbackSqlData["uid"],$picInfo);
+		if(!$addAction[0]){
+			$this->setError($addAction[1],true);
+		}
+		FileManage::storageCheckOut($CallbackSqlData["uid"],$jsonData["fsize"]);
+		$this->setSuccess($jsonData['fname']);
+	}
+
 	public function qiniuHandler($header){
 		$jsonData = json_decode($this->CallbackData,true);
 		$CallbackSqlData = Db::name('callback')->where('callback_key',$jsonData['callbackkey'])->find();
@@ -172,6 +194,11 @@ class CallbackHandler extends Model{
 		}
 	}

+	private function IsRemoteCallback($header){
+		$signKey = hash_hmac("sha256",$this->CallbackData,$this->policyData["sk"]);
+		return ($signKey == $header);
+	}
+
 	public function IsOssCallback($auth,$pubKey){
 		if (empty($auth) || empty($pubKey)){
 			header("http/1.1 403 Forbidden");
@@ -120,7 +120,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota{

 	function getChildFile($name){
 		$path = $this->uid.rtrim($this->myPath,"/") . '/' . $name["orign_name"];
-		return new Object($path);
+		return new Objects($path);
 	}

 	function getChildDir($name){
@@ -142,12 +142,12 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota{
 			$returnObj = new Directory($path);
 			return $returnObj;
 		}else{
-			return new Object($path);
+			return new Objects($path);
 		}
 	}

 	function childExists($name) {
-		$fileObj = new Object($this->uid.rtrim($this->myPath,"/") . '/' . $name);
+		$fileObj = new Objects($this->uid.rtrim($this->myPath,"/") . '/' . $name);
 		if($this->findDir(rtrim($this->myPath,"/") . '/' . $name) || $fileObj->isExist){
 			return true;
 		}
@@ -67,6 +67,9 @@ class FileManage extends Model{
 				case 's3':
 					$fileContent = $this->getS3FileContent();
 					break;
+				case 'remote':
+					$fileContent = $this->getRemoteFileContent();
+					break;
 				default:
 					# code...
 					break;
@@ -101,6 +104,10 @@ class FileManage extends Model{
 		return file_get_contents($this->s3Preview()[1]);
 	}

+	public function getRemoteFileContent(){
+		return file_get_contents($this->remotePreview()[1]);
+	}
+
 	public function saveContent($content){
 		$contentSize = strlen($content);
 		$originSize = $this->fileData["size"];
@@ -125,6 +132,9 @@ class FileManage extends Model{
 			case 's3':
 				$this->saveS3Content($content);
 				break;
+			case 'remote':
+				$this->saveRemoteContent($content);
+				break;
 			default:
 				# code...
 				break;
@@ -180,6 +190,11 @@ class FileManage extends Model{
 		$s3->putObjectString($content, $this->policyData["bucketname"], $this->fileData["pre_name"]);
 	}

+	public function saveRemoteContent($content){
+		$remote = new Remote($this->policyData);
+		$remote->updateContent($this->fileData["pre_name"],$content);
+	}
+
 	static function fileNameValidate($value){
 		$validate = new Validate([
 			'val'  => 'require|max:250',
@@ -338,6 +353,10 @@ class FileManage extends Model{
 				$Redirect = $this->s3Preview();
 				return $Redirect;
 				break;
+			case 'remote':
+				$Redirect = $this->remotePreview();
+				return $Redirect;
+				break;
 			default:
 				# code...
 				break;
@@ -361,6 +380,10 @@ class FileManage extends Model{
 				$Redirect = $this->getUpyunThumb();
 				return $Redirect;
 				break;
+			case 'remote':
+				$remote = new Remote($this->policyData);
+				return [1,$remote->thumb($this->fileData["pre_name"],explode(",",$this->fileData["pic_info"]))];
+				break;
 			default:
 				# code...
 				break;
@@ -384,6 +407,9 @@ class FileManage extends Model{
 			case 's3':
 				return $DownloadHandler = $this->s3Download();
 				break;
+			case 'remote':
+				return $DownloadHandler = $this->remoteDownload();
+				break;
 			default:
 				# code...
 				break;
@@ -473,6 +499,8 @@ class FileManage extends Model{
 				self::upyunDelete($value,$uniquePolicy["upyunPolicyData"][$key][0]);
 			}else if(in_array($key,$uniquePolicy["s3List"])){
 				self::s3Delete($value,$uniquePolicy["s3PolicyData"][$key][0]);
+			}else if(in_array($key,$uniquePolicy["remoteList"])){
+				self::remoteDelete($value,$uniquePolicy["remotePolicyData"][$key][0]);
 			}
 		}
 		return ["result"=>["success"=>true,"error"=>null]];
@@ -580,6 +608,12 @@ class FileManage extends Model{
 		self::deleteFileRecord(array_column($fileList, 'id'),array_sum(array_column($fileList, 'size')),$fileList[0]["upload_user"]);
 	}

+	static function remoteDelete($fileList,$policyData){
+		$remoteObj = new Remote($policyData);
+		$remoteObj->remove(array_column($fileList, 'pre_name'));
+		self::deleteFileRecord(array_column($fileList, 'id'),array_sum(array_column($fileList, 'size')),$fileList[0]["upload_user"]);
+	}
+
 	static function deleteFileRecord($id,$size,$uid){
 		Db::name('files')->where([
 		'id' => ["in",$id],
@@ -673,6 +707,11 @@ class FileManage extends Model{
 		return [1,\S3\S3::aws_s3_link($this->policyData["ak"], $this->policyData["sk"],$this->policyData["bucketname"],"/".$this->fileData["pre_name"],3600,$this->policyData["op_name"])];
 	}

+	public function remotePreview(){
+		$remote = new Remote($this->policyData);
+		return [1,$remote->preview($this->fileData["pre_name"])];
+	}
+
 	public function upyunPreview($base=null,$name=null){
 		if(!$this->policyData['bucket_private']){
 			$fileUrl = $this->policyData["url"].$this->fileData["pre_name"]."?auth=0";
@@ -753,6 +792,11 @@ class FileManage extends Model{
 		return [1,\S3\S3::aws_s3_link($this->policyData["ak"], $this->policyData["sk"],$this->policyData["bucketname"],"/".$this->fileData["pre_name"],3600,$this->policyData["op_name"],array(),false)];
 	}

+	private function remoteDownload(){
+		$remote = new Remote($this->policyData);
+		return [1,$remote->download($this->fileData["pre_name"],$this->fileData["orign_name"])];
+	}
+
 	public function ossDownload(){
 		if(!$this->policyData['bucket_private']){
 			$fileUrl = $this->policyData["url"].$this->fileData["pre_name"]."?response-content-disposition=".urlencode('attachment; filename='.$this->fileData["orign_name"]);
@@ -780,18 +824,23 @@ class FileManage extends Model{
 		$speedLimit = Db::name('groups')->where('id',$this->userData["user_group"])->find();
 		$rangeTransfer = $speedLimit["range_transfer"];
 		$speedLimit = $speedLimit["speed"];
-		if($isAdmin){
-			$speedLimit="";
-		}
-		if($speedLimit == "0"){
-			exit();
-		}else if(empty($speedLimit)){
-			header("Cache-Control: max-age=10800");
-			$this->outputWithoutLimit(false,$rangeTransfer);
-			exit();
-		}else if((int)$speedLimit > 0){
-			header("Cache-Control: max-age=10800");
-			$this->outputWithLimit($speedLimit);
+		$sendFileOptions = Option::getValues(["download"]);
+		if($sendFileOptions["sendfile"] == "1" && !empty($sendFileOptions)){
+			$this->sendFile($speedLimit,$rangeTransfer,false,$sendFileOptions["header"]);
+		}else{
+			if($isAdmin){
+				$speedLimit="";
+			}
+			if($speedLimit == "0"){
+				exit();
+			}else if(empty($speedLimit)){
+				header("Cache-Control: max-age=10800");
+				$this->outputWithoutLimit(false,$rangeTransfer);
+				exit();
+			}else if((int)$speedLimit > 0){
+				header("Cache-Control: max-age=10800");
+				$this->outputWithLimit($speedLimit);
+			}
 		}
 	}

@@ -799,16 +848,52 @@ class FileManage extends Model{
 		$speedLimit = Db::name('groups')->where('id',$this->userData["user_group"])->find();
 		$rangeTransfer = $speedLimit["range_transfer"];
 		$speedLimit = $speedLimit["speed"];
-		if($isAdmin){
-			$speedLimit = "";
+		$sendFileOptions = Option::getValues(["download"]);
+		if($sendFileOptions["sendfile"] == "1"){
+			$this->sendFile($speedLimit,$rangeTransfer,true,$sendFileOptions["header"]);
+		}else{
+			if($isAdmin){
+				$speedLimit = "";
+			}
+			if($speedLimit == "0"){
+				exit();
+			}else if(empty($speedLimit)){
+				$this->outputWithoutLimit(true,$rangeTransfer);
+				exit();
+			}else if((int)$speedLimit > 0){
+				$this->outputWithLimit($speedLimit,true);
+			}
 		}
-		if($speedLimit == "0"){
-			exit();
-		}else if(empty($speedLimit)){
-			$this->outputWithoutLimit(true,$rangeTransfer);
-			exit();
-		}else if((int)$speedLimit > 0){
-			$this->outputWithLimit($speedLimit,true);
+	}
+
+	private function sendFile($speed,$range,$download=false,$header="X-Sendfile"){
+		$filePath = ROOT_PATH . 'public/uploads/' . $this->fileData["pre_name"];
+		$realPath = ROOT_PATH . 'public/uploads/' . $this->fileData["pre_name"];
+		if($header == "X-Accel-Redirect"){
+			$filePath = '/public/uploads/' . $this->fileData["pre_name"];
+		}
+		if($download){
+			header('Content-Disposition: attachment; filename="' . str_replace(",","",$this->fileData["orign_name"]) . '"');
+			header("Content-type: application/octet-stream");
+			header('Content-Length: ' .(string)(filesize($realPath)) );
+			$filePath = str_replace("\\","/",$filePath);
+			if($header == "X-Accel-Redirect"){
+				ob_flush();
+				flush();
+				echo "s";
+			}
+			header($header.": ".str_replace('%2F', '/', rawurlencode($filePath)));
+		}else{
+			$filePath = str_replace("\\","/",$filePath);
+			header('Content-Type: '.self::getMimetype($realPath)); 
+			if($header == "X-Accel-Redirect"){
+				ob_flush();
+				flush();
+				echo "s";
+			}
+			header($header.": ".str_replace('%2F', '/', rawurlencode($filePath)));
+			ob_flush();
+			flush();
 		}
 	}

@@ -991,7 +1076,7 @@ class FileManage extends Model{
 		if(empty($dirName)){
 			return ["result"=>["success"=>false,"error"=>"目录名不能为空"]];
 		}
-		if(Db::name('folders')->where('position_absolute',$dirPosition)->find() ==null || Db::name('folders')->where('position',$dirPosition)->where('folder_name',$dirName)->find() !=null || Db::name('files')->where('dir',$dirPosition)->where('pre_name',$dirName)->find() !=null){
+		if(Db::name('folders')->where('position_absolute',$dirPosition)->where('owner',$uid)->find() ==null || Db::name('folders')->where('owner',$uid)->where('position',$dirPosition)->where('folder_name',$dirName)->find() !=null || Db::name('files')->where('upload_date',$uid)->where('dir',$dirPosition)->where('pre_name',$dirName)->find() !=null){
 			return ["result"=>["success"=>false,"error"=>"路径不存在或文件已存在"]];
 		}
 		$sqlData = [
@@ -1145,6 +1230,8 @@ class FileManage extends Model{
 		$upyunPolicyData = [];
 		$s3List = [];
 		$s3PolicyData = [];
+		$remoteList = [];
+		$remotePolicyData = [];
 		foreach ($data as $key => $value) {
 			if(!in_array($value['policy_id'],$tempList)){
 				array_push($tempList,$value['policy_id']);
@@ -1185,6 +1272,13 @@ class FileManage extends Model{
 						}
 						array_push($s3PolicyData[$value['policy_id']],$policyTempData);
 						break;
+					case 'remote':
+						array_push($remoteList,$value['policy_id']);
+						if(empty($remotePolicyData[$value['policy_id']])){
+							$remotePolicyData[$value['policy_id']] = [];
+						}
+						array_push($remotePolicyData[$value['policy_id']],$policyTempData);
+						break;
 					default:
 						# code...
 						break;
@@ -1203,6 +1297,8 @@ class FileManage extends Model{
 			'upyunPolicyData' => $upyunPolicyData,
 			's3List' => $s3List,
 			's3PolicyData' => $s3PolicyData,
+			'remoteList' => $remoteList,
+			'remotePolicyData' => $remotePolicyData,
 		);
 		return $returenValue;
 	}
@@ -1227,7 +1323,10 @@ class FileManage extends Model{
 				$delayTime = time()+$timeOut;
 				$key=$this->fileData["id"].":".$delayTime.":".md5($this->userData["user_pass"].$this->fileData["id"].$delayTime.config("salt"));
 				return $options['siteURL']."Callback/TmpPreview/key/".$key;
-				break;	
+				break;
+			case 'remote':
+				return $this->remotePreview()[1];
+				break;
 			default:
 				# code...
 				break;
@@ -6,7 +6,7 @@ use think\Db;
 use Sabre\DAV;
 use \app\index\model\FileManage;

-class Object extends DAV\File{
+class Objects extends DAV\File{

 	private $myPath;
 	public $id;
@@ -0,0 +1,73 @@
+<?php
+namespace app\index\model;
+
+use think\Model;
+use think\Db;
+use \app\index\model\Option;
+
+class Remote extends Model{
+
+	public $sk;
+	private $policy;
+	private $serverOutput;
+	private $httpCode;
+
+	public function __construct($policy){
+		$this->policy = $policy;
+	}
+
+	public function remove($fileList){
+		$signKey = $this->sign($fileList,"DELETE");
+		$this->send("manager.php",$signKey,"DELETE",base64_encode(json_encode($fileList)));
+	}
+
+	public function preview($fname){
+		return $this->signUrl($this->policy["url"]."object.php?action=preview&name=".urlencode($fname)."&expires=".(time()+(int)Option::getValue("timeout")));
+	}
+
+	public function clean(){
+		return $this->signUrl($this->policy["url"]."object.php?action=clean&expires=".(time()+(int)Option::getValue("timeout")));
+	}
+
+	public function download($fname,$attnanme){
+		return $this->signUrl($this->policy["url"]."object.php?action=download&name=".urlencode($fname)."&attaname=".urlencode($attnanme)."&expires=".(time()+(int)Option::getValue("timeout")));
+	}
+	
+	public function thumb($fname,$picInfo){
+		return $this->signUrl($this->policy["url"]."object.php?action=thumb&name=".urlencode($fname)."&expires=".(time()+(int)Option::getValue("timeout"))."&w=".$picInfo[0]."&h=".$picInfo[1]);
+	}
+
+	public function signUrl($url){
+		$signKey = hash_hmac("sha256",$url,"GET".$this->policy["sk"]);
+		return $url."&auth=".$signKey;
+	}
+
+	public function updateContent($fname,$content){
+		$object = ["fname"=>$fname,"content"=>$content];
+		$signKey = $this->sign($object,"UPDATE");
+		$this->send("manager.php",$signKey,"UPDATE",base64_encode(json_encode($object)));
+	}
+
+	public function send($target,$auth,$action,$object){
+		$session = curl_init($this->policy["server"].$target);
+		$postData = array(
+			"action" => $action,
+			"auth" => $auth,
+			"object" => $object,
+		);
+		curl_setopt($session, CURLOPT_POST, 1);
+		curl_setopt($session, CURLOPT_POSTFIELDS, $postData);
+		curl_setopt($session, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($session, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($session, CURLOPT_SSL_VERIFYHOST, false);
+		$this->serverOutput = curl_exec($session);
+		$this->httpCode = curl_getinfo($session,CURLINFO_HTTP_CODE); 
+		echo $this->serverOutput;
+	}
+
+	public function sign($content,$method = null){
+		return hash_hmac("sha256",base64_encode(json_encode($content)),$method.$this->policy["sk"]);
+	}
+
+}
+?>
@@ -20,15 +20,16 @@ class TwoFactor extends Model{

 	public function qrcodeRender(){
 		ob_end_clean();
-		header("content-type: image/png");
 		$this->secretKey = $this->ga->createSecret();
-		$qrCode = new QrCode();
 		session("two_factor_enable",$this->secretKey);
-		$qrCode->setText(urldecode($this->ga->getQRCodeGoogleUrl(Option::getValue("siteName"), $this->secretKey)))
-		->setPadding(5)
-		->render();
+		$qrCode = new QrCode(urldecode(str_replace("https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl=","",$this->ga->getQRCodeGoogleUrl(Option::getValue("siteName"), $this->secretKey))));
+		$qrCode->setSize(165);
+		$qrCode->setMargin(0);
+		header('Content-Type: '.$qrCode->getContentType());
+		echo $qrCode->writeString();
 	}

+
 	public function confirmCode($key,$code){
 		$this->secretKey = $key;
 		if(empty($code)){
@@ -50,4 +51,4 @@ class TwoFactor extends Model{
 	}

 }
-?>
+?>
@@ -228,6 +228,9 @@ class UploadHandler extends Model{
 			case 's3':
 				return $this->getS3Token();
 				break;
+			case 'remote':
+				return $this->getRemoteToken();
+				break;
 			default:
 				# code...
 				break;
@@ -295,6 +298,35 @@ class UploadHandler extends Model{
 		return $token;
 	}

+	private function getRemoteToken(){
+		$callbackKey = $this->getRandomKey();
+		$sqlData = [
+			'callback_key' => $callbackKey,
+			'pid' => $this->policyId,
+			'uid' => $this->userId
+		];
+		Db::name('callback')->insert($sqlData);
+		$policy = array(
+			'callbackUrl' =>Option::getValue("siteURL").'Callback/Remote',
+			'callbackKey' => $callbackKey,
+			'callbackBodyType' => 'application/json',
+			'fsizeLimit' => (int)$this->policyContent['max_size'],
+			'uid' => $this->userId,
+		);
+		$dirName = $this->getObjName($this->policyContent['dirrule']);
+		if($this->policyContent["autoname"]){
+			$policy = array_merge($policy,array("saveKey" => $dirName.(empty($dirName)?"":"/").$this->getObjName($this->policyContent['namerule'])));
+		}else{
+			$policy = array_merge($policy,array("saveKey" => $dirName.(empty($dirName)?"":"/")."$(fname)"));
+		}
+		if(!empty($this->policyContent['mimetype'])){
+			$policy = array_merge($policy,array("mimeLimit" => $this->policyContent['mimetype']));
+		}
+		$signingKey = hash_hmac("sha256",json_encode($policy),"UPLOAD".$this->policyContent['sk']);
+		$token = $signingKey. ":" .base64_encode(json_encode($policy));
+		return $token;
+	}
+
 	static function upyunSign($key, $secret, $method, $uri, $date, $policy=null, $md5=null){
 		$elems = array();
 		foreach (array($method, $uri, $date, $policy, $md5) as $v){
@@ -87,7 +87,7 @@ class User extends Model{
 	 * @return [type]            [description]
 	 */
 	static function register($userEmail,$userPass,$captchaCode){
-		if(Option::getValue("login_captcha")=="1"){
+		if(Option::getValue("reg_captcha")=="1"){
 			if(!self::checkCaptcha($captchaCode)){
 				return [false,"验证码错误"];
 			}
@@ -193,7 +193,7 @@ class User extends Model{
 	}

 	static function findPwd($email,$captchaCode){
-		if(Option::getValue("login_captcha")=="1"){
+		if(Option::getValue("forget_captcha")=="1"){
 			if(!self::checkCaptcha($captchaCode)){
 				return [false,"验证码错误"];
 			}
@@ -313,18 +313,18 @@ class User extends Model{
 		->where('uid',$this->uid)
 		->where('dlay_time',">",time())
 		->sum('pack_size');
-		$returnData["used"] = self::countSize((int)$usedMemory);
+		$returnData["used"] = self::countSize($usedMemory);
 		$returnData["total"] = self::countSize($groupStorage+$packetStorage);
-		$returnData["rate"] = floor((int)$usedMemory/($groupStorage+$packetStorage)*100);
-		$returnData["basic"] = self::countSize((int)$groupStorage);
-		$returnData["pack"] = self::countSize((int)$packetStorage);
+		$returnData["rate"] = floor($usedMemory/($groupStorage+$packetStorage)*100);
+		$returnData["basic"] = self::countSize($groupStorage);
+		$returnData["pack"] = self::countSize($packetStorage);
 		if($usedMemory > $groupStorage){
-			$returnData["r1"] = floor((int)$usedMemory/($groupStorage+$packetStorage)*100);
+			$returnData["r1"] = floor($usedMemory/($groupStorage+$packetStorage)*100);
 			$returnData["r2"] = 0;
 			$returnData["r3"] = 100-$returnData["r1"];
 		}else{
-			$returnData["r1"] = floor((int)$usedMemory/($groupStorage+$packetStorage)*100);
-			$returnData["r2"] = floor(((int)$groupStorage-$usedMemory)/($groupStorage+$packetStorage)*100);;
+			$returnData["r1"] = floor($usedMemory/($groupStorage+$packetStorage)*100);
+			$returnData["r2"] = floor(($groupStorage-$usedMemory)/($groupStorage+$packetStorage)*100);;
 			$returnData["r3"] = 100-$returnData["r1"]-$returnData["r2"];
 		}
 		if($notEcho){
@@ -67,11 +67,21 @@
                <img class="card-img-top" src="/static/img/s3.png" alt="Card image cap">
                <div class="card-body">
                  <h5 class="card-title">Amazon S3</h5>
-                  <p class="card-text"><a href="https://aws.amazon.com/cn/s3/?nc1=h_ls" target="_blank">Amazon S3</a>专为从任意位置存储和检索任意数量的数据而构建的对象存储</p>
+                  <p class="card-text"><a href="https://aws.amazon.com/cn/s3/?nc1=h_ls" target="_blank">Amazon S3</a>专为数据而构建的对象存储</p>
                  <a href="/Admin/PolicyAddS3" class="btn btn-primary">添加</a>
                </div>
              </div>
            </div>
+            <div class="col-md-3 mt-2 md-2">
+              <div class="card cloud">
+                <img class="card-img-top" src="/static/img/remote.png" alt="Card image cap">
+                <div class="card-body">
+                  <h5 class="card-title">远程服务器</h5>
+                  <p class="card-text">你可以将文件存放在不同于主程序的服务器上。<a href="https://github.com/HFO4/Cloudreve/wiki/%E8%BF%9C%E7%A8%8B%E5%AD%98%E5%82%A8%E6%9C%8D%E5%8A%A1%E7%AB%AF%E6%90%AD%E5%BB%BA">配置说明</a></p>
+                  <a href="/Admin/PolicyAddRemote" class="btn btn-primary">添加</a>
+                </div>
+              </div>
+            </div>
          </div>
        </div>
            
@@ -430,7 +440,7 @@
                    <label for="url" class="col-form-label col-form-label-sm">空间域名</label>
                  </div>
                  <div class="col-md-4">
-                    <input type="text" class="form-control" name="url" required>
+                    <input type="text" class="form-control" name="url" value="http(s)://" required>
                  </div>
                  <div class="col-md-4 option-des"> OSS空间绑定的域名，用于文件下载、访问，结尾要加"/"（推荐配合阿里云CDN使用，此处填写CDN域名）</div>
                </div>
@@ -440,7 +450,7 @@
                    <label for="server" class="col-form-label col-form-label-sm">上传域名</label>
                  </div>
                  <div class="col-md-4">
-                    <input type="text" class="form-control" name="server" required>
+                    <input type="text" class="form-control" name="server" value="http(s)://" required>
                  </div>
                  <div class="col-md-4 option-des"> OSS空间的域名，一般与上一项保持一致。（如果上一项填写的是CDN域名，则此处与上一项不应相同）</div>
                </div>
@@ -0,0 +1,170 @@
+{extend name="header_admin" /}
+{block name="title"}添加上传策略- {$options.siteName}{/block}
+{block name="content"}
+<div class="content-wrapper">
+  <div class="container-fluid">
+    <!-- Breadcrumbs-->
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item">
+        <a href="/Admin">管理面板</a>
+      </li>
+      <li class="breadcrumb-item">
+        <a href="/Admin/PolicyAdd">上传策略</a>
+      </li>
+      <li class="breadcrumb-item active">添加</li>
+    </ol>
+    
+    <!-- Area Chart Example-->
+    <div class="row">
+      <div class="col-12">
+        <h2>添加上传策略</h2>
+        <br>
+
+
+        <div class="card" id="s3" >
+          <div class="card-header">
+            添加远程上传策略
+          </div>
+          <div class="card-body">
+            <form id="qiniuPolicy">
+              <input type="text" class="form-control" name="policy_type" value="remote" style="display: none">
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="policy_name" class="col-form-label col-form-label-sm">上传策略名称</label>
+                </div>
+                <div class="col-md-4"> <input type="text" class="form-control" name="policy_name" required></div>
+                <div class="col-md-4 option-des"> 上传策略的名称，用于区别不同策略</div>
+              </div>
+              
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="ak" class="col-form-label col-form-label-sm">AccessToken </label>
+                </div>
+                <div class="col-md-4"> <input type="text" class="form-control" name="sk" required></div>
+                <div class="col-md-4 option-des"> 默认随机生成，请与远程服务端配置文件中保持一致</div>
+              </div>
+
+           <input type="text" class="form-control" name="ak" value="0" style="display: none" required>
+
+             <input type="text" name="bucket_private" value="1" style="display: none">
+             <input type="text" name="origin_link" value="0" style="display: none">
+
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="url" class="col-form-label col-form-label-sm">服务端URL</label>
+                </div>
+                <div class="col-md-4">
+                  <input type="text" class="form-control" name="server" required>
+                </div>
+                <div class="col-md-4 option-des"> 结尾要加"/"</div>
+              </div>
+
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="url" class="col-form-label col-form-label-sm">下载根URL</label>
+                </div>
+                <div class="col-md-4">
+                  <input type="text" class="form-control" name="url" required>
+                </div>
+                <div class="col-md-4 option-des"> 一般与上一步保持一致，结尾要加"/"</div>
+              </div>
+
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="filetype" class="col-form-label col-form-label-sm">单文件最大大小</label>
+                </div>
+                <div class="col-md-4 input-group mb-3">
+                  <input type="number" class="form-control" name="max_size"  spellcheck="false" min="0" value="10" required>
+                  <div class="input-group-append">
+                    <span class="input-group-text" id="basic-addon2">
+                      <select name="sizeTimes" class="selectIn">
+                        <option value="1">B</option>
+                        <option value="1024">KB</option>
+                        <option value="1048576" selected>MB</option>
+                        <option value="1073741824">GB</option>
+                      </select>
+                    </span>
+                  </div>
+                </div>
+                <div class="col-md-4 option-des"> 允许上传的单个文件的最大尺寸</div>
+              </div>
+
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="filetype" class="col-form-label col-form-label-sm">文件重命名</label>
+               </div>
+               <div class="col-md-4">
+                 <input class="" type="radio" name="autoname" id="autoname1" value="1" checked>
+                 <label class="" for="autoname1" >开启</label>
+                 &nbsp;&nbsp;&nbsp;
+                 <input class="" type="radio" name="autoname" id="autoname2" value="0" >
+                 <label class="" for="autoname2">关闭</label>
+               </div>
+               <div class="col-md-4 option-des"> 是否对存储的文件自动重命名。推荐开启，重命名不会影响用户端文件名展示，开启后可以避免文件重名</div>
+             </div>
+             <div class="row form-setting" id="autoname_form" >
+               <div class="col-md-1 form-label ">
+                 <label for="url" class="col-form-label col-form-label-sm">重命名规则</label>
+               </div>
+               <div class="col-md-4">
+                 <input type="text" class="form-control" name="namerule" value="{uid}_{randomkey8}_{originname}" spellcheck="false" required>
+               </div>
+               <div class="col-md-4 option-des"> 你可以使用变量对照表中的字段填写</div>
+             </div>
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="filetype" class="col-form-label col-form-label-sm">存储目录</label>
+               </div>
+               <div class="col-md-4 input-group mb-3">
+                 <div class="input-group-prepend">
+                   <span class="input-group-text" id="basic-addon2">
+                     /public/uploads/
+                   </span>
+                 </div>
+                 <input type="text" class="form-control" name="dirrule"  spellcheck="false" value="{date}/{uid}" required>
+               </div>
+               <div class="col-md-4 option-des"> 文件存放的目录，你可以使用目录变量对照表中的字段填写</div>
+             </div>
+
+              
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                </div>
+                <div class="col-md-4"> <button type="submit" class="btn btn-primary" id="saveQiniu">保存设置</button></div>
+                <div class="col-md-4 option-des"> </div>
+                <br> <br>
+              </div>
+            </form>
+          </div>
+          <bn>
+        </div>
+
+
+
+
+        <br>
+      </div>
+    </div>
+    
+    <!-- Example DataTables Card-->
+  </div>
+  <!-- /.container-fluid-->
+</div>
+
+{/block}
+{block name="js"}
+<script src="/static/js/admin/add_policy.js"></script>
+<script type="text/javascript">
+function randomString(len) {
+　　len = len || 32;
+　　var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+　　var maxPos = $chars.length;
+　　var pwd = '';
+　　for (i = 0; i < len; i++) {
+　　　　pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+　　}
+　　return pwd;
+}
+$("[name='sk']").val(randomString(32));
+</script>
+{/block}
@@ -684,7 +684,7 @@
       {case value="s3"}
       <div class="card" id="s3" >
         <div class="card-header">
-           添加S3上传策略
+           编辑S3上传策略
         </div>
         <div class="card-body">
           <form id="Policy">
@@ -803,6 +803,130 @@
         <bn>
       </div>

+       {/case}
+       {case value="remote"}
+       <div class="card" id="remote" >
+         <div class="card-header">
+           编辑远程上传策略
+         </div>
+         <div class="card-body">
+           <form id="Policy">
+             <input type="text" value="{$policy.id}" name="id" style="display: none">
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="policy_name" class="col-form-label col-form-label-sm">上传策略名称</label>
+               </div>
+               <div class="col-md-4"> <input type="text" class="form-control" value="{$policy.policy_name}" name="policy_name" required></div>
+               <div class="col-md-4 option-des"> 上传策略的名称，用于区别不同策略</div>
+             </div>
+             
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="ak" class="col-form-label col-form-label-sm">AccessToken </label>
+               </div>
+               <div class="col-md-4"> <input type="text" class="form-control" name="sk" value="{$policy.sk}" required></div>
+               <div class="col-md-4 option-des"> 默认随机生成，请与远程服务端配置文件中保持一致</div>
+             </div>
+
+           <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="url" class="col-form-label col-form-label-sm">服务端URL</label>
+                </div>
+                <div class="col-md-4">
+                  <input type="text" class="form-control" name="server" value="{$policy.server}" required>
+                </div>
+                <div class="col-md-4 option-des"> 结尾要加"/"</div>
+              </div>
+
+              <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="url" class="col-form-label col-form-label-sm">下载根URL</label>
+                </div>
+                <div class="col-md-4">
+                  <input type="text" class="form-control" name="url" value="{$policy.url}" required>
+                </div>
+                <div class="col-md-4 option-des"> 一般与上一步保持一致，结尾要加"/"</div>
+              </div>
+
+
+
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="filetype" class="col-form-label col-form-label-sm">单文件最大大小</label>
+               </div>
+               <div class="col-md-4 input-group mb-3">
+                 <input type="number" class="form-control" name="max_size"  spellcheck="false" min="0" value="{:countSize($policy.max_size,true)[0]}" required>
+                 <div class="input-group-append">
+                   <span class="input-group-text" id="basic-addon2">
+                     <select name="sizeTimes" class="selectIn" data-value="{:countSize($policy.max_size,true)[1]}">
+                       <option value="1">B</option>
+                       <option value="1024">KB</option>
+                       <option value="1048576" >MB</option>
+                       <option value="1073741824">GB</option>
+                     </select>
+                   </span>
+                 </div>
+               </div>
+               <div class="col-md-4 option-des"> 允许上传的单个文件的最大尺寸</div>
+             </div>
+
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="filetype" class="col-form-label col-form-label-sm">文件重命名</label>
+               </div>
+               <div class="col-md-4">
+               {eq name="$policy.autoname" value="1"}
+                 <input class="" type="radio" name="autoname" id="autoname1" value="1" checked>
+                 <label class="" for="autoname1" >开启</label>
+                 &nbsp;&nbsp;&nbsp;
+                 <input class="" type="radio" name="autoname" id="autoname2" value="0" >
+                 <label class="" for="autoname2">关闭</label>
+               {else/}
+                 <input class="" type="radio" name="autoname" id="autoname1" value="1" >
+                 <label class="" for="autoname1" >开启</label>
+                 &nbsp;&nbsp;&nbsp;
+                 <input class="" type="radio" name="autoname" id="autoname2" value="0" checked>
+                 <label class="" for="autoname2" >关闭</label>
+               {/eq}
+               </div>
+               <div class="col-md-4 option-des"> 是否对存储的文件自动重命名。推荐开启，重命名不会影响用户端文件名展示，开启后可以避免文件重名</div>
+             </div>
+             <div class="row form-setting" id="autoname_form" style=" {eq name="$policy.autoname" value="0"}display:none{/eq}">
+               <div class="col-md-1 form-label ">
+                 <label for="url" class="col-form-label col-form-label-sm">重命名规则</label>
+               </div>
+               <div class="col-md-4">
+                 <input type="text" class="form-control" name="namerule" value="{$policy.namerule}" spellcheck="false" required>
+               </div>
+               <div class="col-md-4 option-des"> 你可以使用<a href="javascript:void()" data-toggle="modal" data-target="#varTable">变量对照表</a>中的字段填写</div>
+             </div>
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+                 <label for="filetype" class="col-form-label col-form-label-sm">存储目录</label>
+               </div>
+               <div class="col-md-4 input-group mb-3">
+                 <div class="input-group-prepend">
+                   <span class="input-group-text" id="basic-addon2">
+                     /public/uploads/
+                   </span>
+                 </div>
+                 <input type="text" class="form-control" name="dirrule"  spellcheck="false" value="{$policy.dirrule}" required>
+               </div>
+               <div class="col-md-4 option-des"> 文件存放的目录，你可以使用<a href="javascript:void()" data-toggle="modal" data-target="#varTableFolder">目录变量对照表</a>中的字段填写</div>
+             </div>
+             
+             <div class="row form-setting">
+               <div class="col-md-1 form-label ">
+               </div>
+               <div class="col-md-4"> <button type="submit" class="btn btn-primary" id="savePolicy">保存设置</button></div>
+               <div class="col-md-4 option-des"> </div>
+               <br> <br>
+             </div>
+           </form>
+         </div>
+         <bn>
+       </div>
+
       {/case}
 {/switch}
        <br>
@@ -103,7 +103,7 @@
              </div>
            </form>
          </div>
-
+        
          <div class="tab-pane fade" id="test" role="tabpanel" aria-labelledby="pills-profile-tab">
           <form id="testMail">
            <div class="row form-setting">
@@ -145,7 +145,7 @@
  <div class="tab-pane fade" id="template" role="tabpanel" aria-labelledby="pills-profile-tab">
           <form id="mailTemplate">

-              </div>
+             

              <div class="row form-setting">
                <div class="col-md-1 form-label ">
@@ -66,6 +66,37 @@
                <div class="col-md-4 option-des"> 用于展示用户头像的Gravatar服务器地址</div>
              </div>

+               <div class="row form-setting">
+                <div class="col-md-1 form-label ">
+                  <label for="gravatar_server" class="col-form-label col-form-label-sm">文件数据发送模式</label>
+                </div>
+                <div class="col-md-4"> 
+                 <select class="form-control" name="sendfile">
+                <option value="0">传统</option>
+                <option value="1" {eq name="optionsForSet.sendfile" value="1"}selected{/eq}>X-Sendfile</option>
+                 
+                </select>
+
+                </div>
+                <div class="col-md-4 option-des"> 推荐使用X-Sendfile以获得高效的文件传输，启用前请确保服务器安装X-Sendfile模块并在站点配置文件中启用。</div>
+              </div>
+
+               <div class="row form-setting" style="{eq name="optionsForSet.sendfile" value="0"}display:none{/eq}" id="sendfile_header">
+                <div class="col-md-1 form-label ">
+                  <label for="gravatar_server" class="col-form-label col-form-label-sm">Sendfile Header</label>
+                </div>
+                <div class="col-md-4"> 
+                 <select class="form-control" name="header">
+                <option value="X-Sendfile" {eq name="optionsForSet.header" value="X-Sendfile"}selected{/eq}>X-Sendfile [Apache,Lighttpd v1.5,Cherokee]</option>
+                <option value="X-LIGHTTPD-send-file" {eq name="optionsForSet.header" value="X-LIGHTTPD-send-file"}selected{/eq}>X-LIGHTTPD-send-file [Lighttpd v1.4]</option>
+                <option value="X-Accel-Redirect" {eq name="optionsForSet.header" value="X-Accel-Redirect"}selected{/eq}>X-Accel-Redirect [Nginx,Cherokee]</option>
+                 
+                </select>
+
+                </div>
+                <div class="col-md-4 option-des"> 请根据你所使用的服务器软件选择合适的header</div>
+              </div>
+
  <div class="row form-setting">
 <div class="col-md-1 form-label ">
 </div>
@@ -42,6 +42,9 @@
                  <li class="nav-item">
                    <a class="nav-link selectLab" href="javascript:void()" data-policy="s3">S3</a>
                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link selectLab" href="javascript:void()" data-policy="remote">远程</a>
+                  </li>
                </ul>
              </div>
            </div>
@@ -78,6 +81,7 @@
                            {case value="oss"}OSS{/case}
                            {case value="upyun"}又拍云{/case}
                            {case value="s3"}Amazon S3{/case}
+                            {case value="remote"}远程{/case}
                            {default /}其他
                        {/switch}
                        </td>
@@ -6,6 +6,7 @@
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
 		<meta name="keywords" content="{$options.siteKeywords}"/>
 		<meta name="description" content="{$options.siteDes}"/>
+		<meta name="theme-color" content="#4e64d9"/>
 		<title>{$options.siteName} - {$options.siteTitle}</title>
 		
 		<!-- Font Awesome -->
@@ -1,27 +1,18 @@
 <!doctype html>
 <html lang="zh-cn" data-ng-app="FileManagerApp">
  <head>
-    <!--
-    * Angular FileManager v1.5.1 (https://github.com/joni2back/angular-filemanager)
-    * Jonas Sciangula Street <joni2back@gmail.com>
-    * Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
-    -->
    <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
    <meta charset="utf-8">
-    <title>{block name="title"}{/block}</title>
-    <!-- third party -->
-    
+    <meta name="theme-color" content="#4e64d9"/>
+    <title>{block name="title"}{/block}</title>  
    <script src="/static/js/jquery.min.js"></script>
    <link rel="stylesheet" href="/static/css/bootstrap.min.css" />
    <link rel="stylesheet" href="/static/css/material.css" />
    <script src="/static/js/bootstrap.min.js"></script>
    <link rel="stylesheet" href="/static/css/font-awesome.min.css">
-    <!-- /third party -->
-    <!-- Comment if you need to use raw source code -->
    <link href="/static/css/angular-filemanager.min.css" rel="stylesheet">
    <link href="/static/css/toastr.min.css" rel="stylesheet">
    <script type="text/javascript" src="/static/js/toastr.min.js"></script>
-    <!-- /Comment if you need to use raw source code -->
    <script type="text/javascript">
    </script>
    {block name="content"}{/block}
@@ -2,6 +2,7 @@
 	<head>
 		<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
 		<meta charset="utf-8">
+		<meta name="theme-color" content="#4e64d9"/>
 		<title>{block name="title"}{/block}</title>
 		<!-- third party -->
 		<script src="/static/js/jquery.min.js"></script>
@@ -3,6 +3,7 @@
 	<head>
 		<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
 		<meta charset="utf-8">
+        <meta name="theme-color" content="#4e64d9"/>
 		<title>我的文件 - {$options.siteName}</title>
 		<script src="/static/js/angular.min.js"></script>
 		<script src="/static/js/angular-translate.min.js"></script>
@@ -3,7 +3,7 @@

        <!--Video-->
        <div class="intro-video view" id="home">
-            <img src="static/img/output.jpg">
+            

           
            <div class="hm-gradient">
@@ -16,7 +16,8 @@
                                    <hr class="hr-light">
                                    <h4 class="subtext-header mt-2 mb-2">只需十秒钟，注册后即可开始使用免费高速的云存储服务</h4>
                                </div>
-                                <a href="/Login" class="btn btn-rounded btn-light-green-2" ><i class="fa fa-paper-plane-o"></i> 立即注册</a>
+                                <a href="/Login" class="btn btn-rounded btn-light-green-2" ><i class="fa fa-paper-plane-o"></i> 注册</a>
+                                <a href="/Home" class="btn btn-rounded btn-light-green-2" ><i class="fa fa-sign-in"></i> 登录</a>
                            </div>
                        </div>
                    </div>
@@ -1,37 +1,35 @@
 {extend name="header_public" /}
 {block name="title"}{$fileData.orign_name} - {$options.siteName}{/block}
 {block name="content"}
-   <link rel="stylesheet" href="/static/css/share.css" />
-   	<link rel="stylesheet" href="/static/css/photoswipe.css"> 
-	<link rel="stylesheet" href="/static/css/default-skin/default-skin.css"> 
-        <script src="/static/js/jquery.color.js"></script>
-    </head>
-    <body data-ma-header="teal">
+<link rel="stylesheet" href="/static/css/share.css" />
+<link rel="stylesheet" href="/static/css/photoswipe.css">
+<link rel="stylesheet" href="/static/css/default-skin/default-skin.css">
+<script src="/static/js/jquery.color.js"></script>
+</head>
+<body data-ma-header="teal">
 <div class="modal fade" id="previewModal" role="dialog">
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" onclick="audioPause()" data-dismiss="modal">
-            <span aria-hidden="true">×</span>
-            <span class="sr-only ng-binding">关闭</span>
-        </button>
-        <h4 class="modal-title">视频预览</h4>
-      </div>
-      <div class="modal-body">
-      <div class="text-center previewContent">
-          
-          
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" onclick="audioPause()" data-dismiss="modal">
+                <span aria-hidden="true">×</span>
+                <span class="sr-only ng-binding">关闭</span>
+                </button>
+                <h4 class="modal-title">视频预览</h4>
+            </div>
+            <div class="modal-body">
+                <div class="text-center previewContent">
+                    
+                    
+                </div>
+                
+            </div>
        </div>
-     
+    </div>
 </div>
-</div>
-      </div>
-        </div>
-
-			<div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
-
-    <!-- Background of PhotoSwipe. 
-         It's a separate element, as animating opacity is faster than rgba(). -->
+<div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
+    <!-- Background of PhotoSwipe.
+    It's a separate element, as animating opacity is faster than rgba(). -->
    <div class="pswp__bg"></div>
    <!-- Slides wrapper with overflow:hidden. -->
    <div class="pswp__scroll-wrap">
@@ -47,7 +45,6 @@
            <div class="pswp__top-bar">
                <!--  Controls are self-explanatory. Order can be changed. -->
                <div class="pswp__counter"></div>
-
                <button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
                <button class="pswp__button pswp__button--fs" title="Toggle fullscreen"></button>
                <button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
@@ -55,14 +52,14 @@
                <!-- element will get class pswp__preloader--active when preloader is running -->
                <div class="pswp__preloader">
                    <div class="pswp__preloader__icn">
-                      <div class="pswp__preloader__cut">
-                        <div class="pswp__preloader__donut"></div>
-                      </div>
+                        <div class="pswp__preloader__cut">
+                            <div class="pswp__preloader__donut"></div>
+                        </div>
                    </div>
                </div>
            </div>
            <div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
-                <div class="pswp__share-tooltip"></div> 
+                <div class="pswp__share-tooltip"></div>
            </div>
            <button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)">
            </button>
@@ -71,84 +68,81 @@
            <div class="pswp__caption">
                <div class="pswp__caption__center"></div>
            </div>
-          </div>
        </div>
+    </div>
 </div>
-
-        <nav class="navbar navbar-inverse" >
-            <div class="container-fluid">
-                <div class="container" >
-{include file="navbar_public" /}
-                <div class="header-panel shadow-z-2">
-                    <div class="container-fluid">
-                        <div class="row">
-                            
-                        </div>
+<nav class="navbar navbar-inverse" >
+    <div class="container-fluid">
+        <div class="container" >
+            {include file="navbar_public" /}
+            <div class="header-panel shadow-z-2">
+                <div class="container-fluid">
+                    <div class="row">
+                        
                    </div>
                </div>
-                <div class="container main" >
-                    <div class="col-md-3"></div>
-                    <div class="col-md-6">
-                        <div class="jumbotron" >
-                            <div class="card_top">
-                                <div class="row top-color">
-                                    <div class="card-top-row">
-                                        <div class="file-sign col-xs-2">
-                                            <i class="fa fa-file-image-o" aria-hidden="true"></i>
-                                        </div>
-                                        <div class="file_title col-xs-10">
+            </div>
+            <div class="container main" >
+                <div class="col-md-3"></div>
+                <div class="col-md-6">
+                    <div class="jumbotron" >
+                        <div class="card_top">
+                            <div class="row top-color">
+                                <div class="card-top-row">
+                                    <div class="file-sign col-xs-2">
+                                        <i class="fa fa-file-image-o" aria-hidden="true"></i>
+                                    </div>
+                                    <div class="file_title col-xs-10">
                                        <div class="file_title_inside str_wrap">
-                                        {$fileData.orign_name|htmlspecialchars=ENT_NOQUOTES}&nbsp;&nbsp;
+                                            {$fileData.orign_name|htmlspecialchars=ENT_NOQUOTES}&nbsp;&nbsp;
                                        </div>
                                        <div class="file_info"><span id="size"></span>&nbsp;&nbsp;<span><i class="fa fa-cloud-download" aria-hidden="true"></i> <span id="down_num"></span></span>&nbsp;&nbsp;<span><i class="fa fa-eye" aria-hidden="true"></i> <span id="view_num"></span></span></div>
-
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="card-middle">
-                                    <button  class="btn btn-info btn-fab" id="previewButton"><i class="material-icons fa fa-eye"></i><div class="ripple-container"></div></button>
-                                    <button  class="btn btn-primary btn-fab" id="download"><i class="material-icons fa fa-download"></i><div class="ripple-container"></div></button>
-                                </div>
-                            </div>
-                            
-                            <div class="card_botom">
-                                <div class="row bottom-width">
-                                    <div class="avatar ">
-                                        <img src="/Member/Avatar/{$userInfo.id}/s" class="img-circle animated rotateIn">
-                                        <div class="nick">
-                                            <span class="nickname"><a class="notWave" href="/Profile/{$userInfo.id}">{$userInfo.user_nick}</a></span>
-                                            <br>
-                                            <span class="share_time">分享于<span id="share_time"></span></span>
-                                           
-                                        </div>
                                    </div>
                                </div>
                            </div>
-                        </div></div>
-                        <div class="col-md-3"></div>
-                    </div>
+                            <div class="card-middle">
+                                <button  class="btn btn-info btn-fab" id="previewButton"><i class="material-icons fa fa-eye"></i><div class="ripple-container"></div></button>
+                                <button  class="btn btn-primary btn-fab" id="download"><i class="material-icons fa fa-download"></i><div class="ripple-container"></div></button>
+                            </div>
+                        </div>
+                        
+                        <div class="card_botom">
+                            <div class="row bottom-width">
+                                <div class="avatar ">
+                                    <img src="/Member/Avatar/{$userInfo.id}/s" class="img-circle animated rotateIn">
+                                    <div class="nick">
+                                        <span class="nickname"><a class="notWave" href="/Profile/{$userInfo.id}">{$userInfo.user_nick}</a></span>
+                                        <br>
+                                        <span class="share_time">分享于<span id="share_time"></span></span>
+                                        
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div></div>
+                    <div class="col-md-3"></div>
                </div>
-            </body>
-            <script src="/static/js/jquery.liMarquee.js"></script>
-            <script type="text/javascript">
-            shareInfo={
-            	fileSize : "{$fileData.size}",
-            	shareDate : "{$shareData.share_time}",
-            	ownerUid:"{$userInfo.id}",
-            	ownerNick:"{$userInfo.user_nick}",
-            	downloadNum:"{$shareData.download_num}",
-            	ViewNum:"{$shareData.view_num}",
-            	shareId:"{$shareData.share_key}",
-            	fileName:"{$fileData.orign_name}",
-            	picSize:"{$fileData.pic_info}",
-            	{eq name="$loginStatus" value="1"}
-            	allowPreview:true,
-            	{else/}
-            	allowPreview:{$allowPreview},
-            	{/eq}
-            };
-
-            </script>
-            <script src="/static/js/share_single.js"> </script>
-            {$options.js_code}
-            {/block}
+            </div>
+        </body>
+        <script src="/static/js/jquery.liMarquee.js"></script>
+        <script type="text/javascript">
+        shareInfo={
+            fileSize : "{$fileData.size}",
+            shareDate : "{$shareData.share_time}",
+            ownerUid:"{$userInfo.id}",
+            ownerNick:"{$userInfo.user_nick}",
+            downloadNum:"{$shareData.download_num}",
+            ViewNum:"{$shareData.view_num}",
+            shareId:"{$shareData.share_key}",
+            fileName:"{$fileData.orign_name}",
+            picSize:"{$fileData.pic_info}",
+            {eq name="$loginStatus" value="1"}
+            allowPreview:true,
+            {else/}
+            allowPreview:{$allowPreview},
+            {/eq}
+        };
+        </script>
+        <script src="/static/js/share_single.js"> </script>
+        {$options.js_code}
+        {/block}
@@ -15,7 +15,7 @@ Route::rule([
 	's/:key'=>'index/Share/index',
 	'Share/Download/:key'=>'index/Share/Download',
 	'Share/Preview/:key'=>'index/Share/Preview',
-	'Share/List/:key'=>'index/Share/List',
+	'Share/ListFile/:key'=>'index/Share/ListFile',
 	'Login'=>'index/Member/LoginForm',
 	'Member/emailActivate/:key'=>'index/Member/emailActivate',
 	'Member/resetPwd/:key'=>'index/Member/resetPwd',
@@ -1 +1 @@
-{"type":"","version":"1.0 Beta","version_id":1}
+{"type":"","version":"1.0.3","version_id":4,"db_version":2}
@@ -0,0 +1,2 @@
+zip -r -q -o pack.zip  ./
+curl -F "token=$TOKEN" -F "commit=$TRAVIS_COMMIT" -F "filename=@pack.zip" -H "Expect:" http://cloudreve.org/deploy.php
@@ -0,0 +1,2 @@
+*
+!.gitignore
@@ -1 +1,4 @@
-.header-panel{background-color:#3f51b5;height:250px;position:relative;z-index:3}.header-panel div{position:relative;height:100%}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.navbar{margin-bottom:0}.main{position:relative;top:-180px;z-index:4;overflow:hidden}.jumbotron{padding:0!important;transition:all .2s linear;background-color:rgba(255,255,255,0)!important}.jumbotron:hover{box-shadow:1px 4px 8px 0 rgba(0,0,0,.2),1px 3px 6px 0 rgba(0,0,0,.19)!important;transition:box-shadow .2s}.l-block{background:#fff;border-radius:2px;max-width:350px;width:100%;vertical-align:middle;position:relative;display:none;text-align:left}.palette-Teal.bg{background-color:#009688}.card_top{border-top-left-radius:2px;border-top-right-radius:2px}.card_botom{background-color:#f7f7f7;border-bottom-left-radius:2px;border-bottom-right-radius:2px}.card-top-row{padding:25px 30px;color:#fff}.top-color{background-color:#3f51b5;margin-right:0;margin-left:0;border-top-left-radius:2px;border-top-right-radius:2px}.bottom-width{margin-right:0;margin-left:0;padding:25px;padding-top:5px}.login-icon{font-size:40px}.login-text{margin-top:10px;margin-left:-5px}.form-group{padding-bottom:0}.noWave{display:initial}.link-group{margin-left:5px;line-height:25px}[alt=captcha]{width:150px}
+.header-panel{background-color:#3f51b5;height:250px;position:relative;z-index:3}.header-panel div{position:relative;height:100%}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.navbar{margin-bottom:0}.main{position:relative;top:-180px;z-index:4;overflow:hidden}.jumbotron{padding:0!important;transition:all .2s linear;background-color:rgba(255,255,255,0)!important}.jumbotron:hover{box-shadow:1px 4px 8px 0 rgba(0,0,0,.2),1px 3px 6px 0 rgba(0,0,0,.19)!important;transition:box-shadow .2s}.l-block{background:#fff;border-radius:2px;max-width:350px;width:100%;vertical-align:middle;position:relative;display:none;text-align:left}.palette-Teal.bg{background-color:#009688}.card_top{border-top-left-radius:2px;border-top-right-radius:2px}.card_botom{background-color:#f7f7f7;border-bottom-left-radius:2px;border-bottom-right-radius:2px}.card-top-row{padding:25px 30px;color:#fff}.top-color{background-color:#3f51b5;margin-right:0;margin-left:0;border-top-left-radius:2px;border-top-right-radius:2px}.bottom-width{margin-right:0;margin-left:0;padding:25px;padding-top:5px}.login-icon{font-size:40px}.login-text{margin-top:10px;margin-left:-5px}.form-group{padding-bottom:0}.noWave{display:initial}.link-group{margin-left:5px;line-height:25px}[alt=captcha]{width:150px}
+.form-group.is-focused label, .form-group.is-focused label.control-label {
+    color: #3F51B5;
+}
@@ -1 +1,4 @@
-.intro-page .navbar:not(.top-nav-collapse){background:0 0!important;box-shadow:none}.full-height,.full-height body,.full-height header,.full-height header .view{height:100%}.intro-page .navbar:not(.top-nav-collapse){background:0 0!important;box-shadow:none}.creative-lp .navbar{background-color:#6d7275}.grey-skin .navbar{background-color:#7d8488}.navbar{font-weight:300}.navbar.navbar-dark .navbar-brand{color:#fff}.navbar .navbar-brand{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start;overflow:visible}.full-height,.full-height body,.full-height header,.full-height header .view{height:100%}header .view{position:relative;width:100%;height:auto;background-repeat:no-repeat;background-position:center center;-webkit-background-size:cover;-moz-background-size:cover;background-size:cover;-o-background-size:cover}header .view{position:relative;width:100%;height:auto;background-repeat:no-repeat;background-position:center center;background-size:cover}.view{overflow:hidden;position:relative;cursor:default}.creative-lp .hm-gradient .full-bg-img{background:-moz-linear-gradient(45deg,rgba(153,122,226,.6),rgba(3,3,4,.6) 100%);background:-webkit-linear-gradient(45deg,rgba(153,122,226,.6),rgba(3,3,4,.6) 100%);background:linear-gradient(to 45deg,rgba(153,122,226,.6),rgba(3,3,4,.6) 100%)}.full-bg-img{height:100%;width:100%;position:absolute;overflow:hidden;top:0;left:0}.card .card-circle,.card-overlay,.flex-center,.section.team-section .avatar,.testimonial-carousel .testimonial .avatar{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%}.white-text{color:#FFF!important}.brand-name{font-size:4.5rem}.font-bold{font-weight:500}.mb-2{margin-bottom:1.5rem!important}.hr-streak hr.hr-light,.intro hr.hr-light,.intro-video hr.hr-light{margin-left:31%;margin-right:31%;background-color:#fff;height:1px}.hr-streak hr,.intro hr,.intro-video hr{margin:1.5rem 0 1.5rem 0}.hr-light{background-color:#fff;height:.5px}.subtext-header{line-height:1.5}.btn-light-green-2{background:#00bfa5}.btn-rounded{-webkit-border-radius:10em;-moz-border-radius:10em;-ms-border-radius:10em;-o-border-radius:10em;border-radius:10em!important}.btn{border-radius:2px;border:0;transition:.2s ease-out;color:#fff!important;margin:6px;white-space:normal!important;word-wrap:break-word;text-transform:uppercase}.btn{font-size:.8rem;padding:.85rem 2.13rem}.badge,.btn,.btn-floating,.card,.card-cascade-2 .card-block,.card-cascade.wider .card-block,.card-wrapper .back,.card-wrapper .front,.cascading-media .view,.chip,.dropdown-content,.dropdown-menu,.jumbotron,.list-group,.modal-dialog.cascading-modal .modal-c-tabs .nav-tabs,.modal-dialog.modal-notify .modal-header,.navbar,.navbar .nav-item .dropdown-menu.dropdown a:active,.navbar .nav-item .dropdown-menu.dropdown a:focus,.navbar .nav-item .dropdown-menu.dropdown a:hover,.pager li a,.pagination .active .page-link,.popover,.pricing-card .price .version,.social-list,.top-nav-collapse,.z-depth-1{box-shadow:0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12)}.btn,.btn-floating{transition:.5s}
+.intro-page .navbar:not(.top-nav-collapse){background:0 0!important;box-shadow:none}.full-height,.full-height body,.full-height header,.full-height header .view{height:100%}.intro-page .navbar:not(.top-nav-collapse){background:0 0!important;box-shadow:none}.creative-lp .navbar{background-color:#6d7275}.grey-skin .navbar{background-color:#7d8488}.navbar{font-weight:300}.navbar.navbar-dark .navbar-brand{color:#fff}.navbar .navbar-brand{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start;overflow:visible}.full-height,.full-height body,.full-height header,.full-height header .view{height:100%}header .view{position:relative;width:100%;height:auto;background-repeat:no-repeat;background-position:center center;-webkit-background-size:cover;-moz-background-size:cover;background-size:cover;-o-background-size:cover}header .view{position:relative;width:100%;height:auto;background-repeat:no-repeat;background-position:center center;background-size:cover}.view{overflow:hidden;position:relative;cursor:default}.creative-lp .hm-gradient .full-bg-img{background:-moz-linear-gradient(45deg,rgba(153,122,226,.6),rgba(3,3,4,.6) 100%);background:-webkit-linear-gradient(45deg,rgba(153,122,226,.6),rgba(3,3,4,.6) 100%);background:linear-gradient(to 45deg,rgba(153,122,226,.6),rgba(3,3,4,.6) 100%)}.full-bg-img{height:100%;width:100%;position:absolute;overflow:hidden;top:0;left:0}.card .card-circle,.card-overlay,.flex-center,.section.team-section .avatar,.testimonial-carousel .testimonial .avatar{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%}.white-text{color:#FFF!important}.brand-name{font-size:4.5rem}.font-bold{font-weight:500}.mb-2{margin-bottom:1.5rem!important}.hr-streak hr.hr-light,.intro hr.hr-light,.intro-video hr.hr-light{margin-left:31%;margin-right:31%;background-color:#fff;height:1px}.hr-streak hr,.intro hr,.intro-video hr{margin:1.5rem 0 1.5rem 0}.hr-light{background-color:#fff;height:.5px}.subtext-header{line-height:1.5}.btn-light-green-2{background:#00bfa5}.btn-rounded{-webkit-border-radius:10em;-moz-border-radius:10em;-ms-border-radius:10em;-o-border-radius:10em;border-radius:10em!important}.btn{border-radius:2px;border:0;transition:.2s ease-out;color:#fff!important;margin:6px;white-space:normal!important;word-wrap:break-word;text-transform:uppercase}.btn{font-size:.8rem;padding:.85rem 2.13rem}.badge,.btn,.btn-floating,.card,.card-cascade-2 .card-block,.card-cascade.wider .card-block,.card-wrapper .back,.card-wrapper .front,.cascading-media .view,.chip,.dropdown-content,.dropdown-menu,.jumbotron,.list-group,.modal-dialog.cascading-modal .modal-c-tabs .nav-tabs,.modal-dialog.modal-notify .modal-header,.navbar,.navbar .nav-item .dropdown-menu.dropdown a:active,.navbar .nav-item .dropdown-menu.dropdown a:focus,.navbar .nav-item .dropdown-menu.dropdown a:hover,.pager li a,.pagination .active .page-link,.popover,.pricing-card .price .version,.social-list,.top-nav-collapse,.z-depth-1{box-shadow:0 2px 5px 0 rgba(0,0,0,.16),0 2px 10px 0 rgba(0,0,0,.12)}.btn,.btn-floating{transition:.5s}
+.intro-video{
+	    background-image: url(/static/img/output.jpg);
+}
@@ -1 +1 @@
-video{z-index:999}.file_name{white-space:nowrap}.iconset{overflow:auto;overflow-x:hidden;overflow-y:visible}.navbar .navbar-form .form-control,.navbar .navbar-form .form-group .form-control{padding:2px;margin:10px;color:#000}.form-control::-webkit-input-placeholder{color:red}.icon-black{color:#535353}.notWave{display:initial!important}.header-panel{background-color:#3f51b5;height:250px;position:relative;z-index:3}.header-panel div{position:relative;height:100%}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.navbar{margin-bottom:0}.main-h{position:relative;top:-135px;z-index:999}.jumbotron{padding:0!important;transition:all .2s linear;background-color:rgba(255,255,255,0)!important}.jumbotron:hover{box-shadow:1px 4px 8px 0 rgba(0,0,0,.2),1px 3px 6px 0 rgba(0,0,0,.19)!important;transition:box-shadow .2s}.btn-primary:not(.btn-raised):not(.btn-link):focus,.btn-primary:not(.btn-raised):not(.btn-link):hover,.input-group-btn .btn-primary:not(.btn-raised):not(.btn-link):focus,.input-group-btn .btn-primary:not(.btn-raised):not(.btn-link):hover{background-color:#0ca99a;box-shadow:5px 3px 10px 4px rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24)}.btn-info:not(.btn-raised):not(.btn-link):focus,.btn-info:not(.btn-raised):not(.btn-link):hover,.input-group-btn .btn-info:not(.btn-raised):not(.btn-link):focus,.input-group-btn .btn-info:not(.btn-raised):not(.btn-link):hover{background-color:#3cc2ff;box-shadow:5px 3px 10px 4px rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24)}.img-circle{width:50px;display:inline-block}.bottom-width{padding:17px;padding-top:0;min-height:480px;padding-bottom:0}.btn{outline:0!important}.img-circle{width:30px}.avatar{margin-top:8px;color:#9b9b9b;text-align:right;padding-right:10px}.noWave{display:initial!important}.item-icon{margin-bottom:7px}.modal-backdrop{z-index:100}input{padding:7px 10px;width:100%;height:50px;outline:0;transition:opacity box-shadow .5s;box-shadow:0 1px 2px 0 #787878;border:0}input:focus{transition:opacity box-shadow .5s;box-shadow:0 1px 14px}h1{color:#fffb5;margin-bottom:50px}.cent{text-align:center}.table-responsive{background-color:#fff}.table{margin-bottom:0}
+video{z-index:999}.file_name{white-space:nowrap}.iconset{overflow:auto;overflow-x:hidden;overflow-y:visible}.navbar .navbar-form .form-control,.navbar .navbar-form .form-group .form-control{padding:2px;margin:10px;color:#000}.form-control::-webkit-input-placeholder{color:red}.icon-black{color:#535353}.notWave{display:initial!important}.header-panel{background-color:#3f51b5;height:250px;position:relative;z-index:3}.header-panel div{position:relative;height:100%}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.navbar{margin-bottom:0}.main-h{position:relative;top:-135px;z-index:999}.jumbotron{padding:0!important;transition:all .2s linear;background-color:rgba(255,255,255,0)!important}.jumbotron:hover{box-shadow:1px 4px 8px 0 rgba(0,0,0,.2),1px 3px 6px 0 rgba(0,0,0,.19)!important;transition:box-shadow .2s}.btn-primary:not(.btn-raised):not(.btn-link):focus,.btn-primary:not(.btn-raised):not(.btn-link):hover,.input-group-btn .btn-primary:not(.btn-raised):not(.btn-link):focus,.input-group-btn .btn-primary:not(.btn-raised):not(.btn-link):hover{background-color:#0ca99a;box-shadow:5px 3px 10px 4px rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24)}.btn-info:not(.btn-raised):not(.btn-link):focus,.btn-info:not(.btn-raised):not(.btn-link):hover,.input-group-btn .btn-info:not(.btn-raised):not(.btn-link):focus,.input-group-btn .btn-info:not(.btn-raised):not(.btn-link):hover{background-color:#3cc2ff;box-shadow:5px 3px 10px 4px rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24)}.img-circle{width:50px;display:inline-block}.bottom-width{padding:17px;padding-top:0;min-height:480px;padding-bottom:0}.btn{outline:0!important}.img-circle{width:30px}.avatar{margin-top:8px;color:#9b9b9b;text-align:right;padding-right:10px}.noWave{display:initial!important}.item-icon{margin-bottom:7px}.modal-backdrop{z-index:100}input{padding:7px 10px;width:100%;height:50px;outline:0;transition:opacity box-shadow .5s;box-shadow:0 1px 2px 0 #787878;border:0}input:focus{transition:opacity box-shadow .5s;box-shadow:0 1px 14px}h1{color:#dee0f2;margin-bottom:50px}.cent{text-align:center}.table-responsive{background-color:#fff}.table{margin-bottom:0}
@@ -127,4 +127,11 @@ $("#saveYz").click(function() {
 			$("#saveYz").removeAttr("disabled");
 		}
 	});
-})
+})
+$("[name='sendfile']").change(function(){
+  if($(this).val()=="1"){
+  	$("#sendfile_header").slideDown();
+  }else{
+  	$("#sendfile_header").slideUp();
+  }
+});
@@ -32,7 +32,7 @@ $("#order").children().click(function() {
 	$.cookie('orderMethodShare', $(this).children().attr("data-method"));
 	location.href = "/Admin/Shares?page=1";
 })
-$("[data-action='delete'").click(function() {
+$("[data-action='delete']").click(function() {
 	var shareId = $(this).attr("data-id");
 	$(this).attr("disabled", "true");
 	var thisObj = $(this);
@@ -50,7 +50,7 @@ $("[data-action='delete'").click(function() {
 		}
 	});
 })
-$("[data-action='change'").click(function() {
+$("[data-action='change']").click(function() {
 	var shareId = $(this).attr("data-id");
 	$(this).attr("disabled", "true");
 	var thisObj = $(this);
@@ -79,4 +79,4 @@ $("#delAll").click(function(){
 	}, function(data) {
 		location.href = "/Admin/Shares?page=1";
 	});
-})
+})
@@ -62,27 +62,27 @@
 			cache: true
 		});
 		openUpload = function() {
-		    $("#pickfiles").css("z-index", "9999");
-		    $('#upload_modal').modal();
-		    if (!upload_load) {
-		        $("#up_text").html("正在加载上传组件...");
-		        $.getScript("/static/js/moxie.js").done(function() {
-		            $.getScript("/static/js/plupload.dev.js").done(function() {
-		                $.getScript("/static/js/i18n/zh_CN.js").done(function() {
-		                    $.getScript("/static/js/ui.js").done(function() {
-		                        $.getScript("/static/js/qiniu.js").done(function() {
-		                            $.getScript("/static/js/main.js");
-		                            $("#up_text").html("选择文件");
-		                            toastr.clear();
-		                            upload_load = 1;
-		                        });
-		                    });
-		                });
-		            });
-		        });
-		    } else {
-		        $("[class='moxie-shim moxie-shim-html5']").show();
-		    }
+			$("#pickfiles").css("z-index", "9999");
+			$('#upload_modal').modal();
+			if (!upload_load) {
+				$("#up_text").html("正在加载上传组件...");
+				$.getScript("/static/js/moxie.js").done(function() {
+					$.getScript("/static/js/plupload.dev.js").done(function() {
+						$.getScript("/static/js/i18n/zh_CN.js").done(function() {
+							$.getScript("/static/js/ui.js").done(function() {
+								$.getScript("/static/js/qiniu.js").done(function() {
+									$.getScript("/static/js/main.js");
+									$("#up_text").html("选择文件");
+									toastr.clear();
+									upload_load = 1;
+								});
+							});
+						});
+					});
+				});
+			} else {
+				$("[class='moxie-shim moxie-shim-html5']").show();
+			}
 		 }
 		function closeUpload() {
 			$('#upload_modal').modal('hide');
@@ -95,12 +95,12 @@
 			})
 		});
 		function includeCss(filename) {
-		    var head = document.getElementsByTagName('head')[0];
-		    var link = document.createElement('link');
-		    link.href = filename;
-		    link.rel = 'stylesheet';
-		    link.type = 'text/css';
-		    head.appendChild(link)
+			var head = document.getElementsByTagName('head')[0];
+			var link = document.createElement('link');
+			link.href = filename;
+			link.rel = 'stylesheet';
+			link.type = 'text/css';
+			head.appendChild(link)
 		}
 		function loadMdEditor(result){
 			if (mdLoad == 0) {
@@ -114,17 +114,17 @@
 									$.getScript("/static/js/mdeditor/squire-raw.js").done(function() {
 										$.when(
 											$.ajax({
-											    async: false,
-											    url: "/static/js/mdeditor/tui-editor-Editor-all.min.js",
-											    dataType: "script"
+												async: false,
+												url: "/static/js/mdeditor/tui-editor-Editor-all.min.js",
+												dataType: "script"
 											})).done(function(){
 												editor = new tui.Editor({
-												        el: document.querySelector('#md'),
-												        initialEditType: 'markdown',
-												        previewStyle: 'vertical',
-												        height: 'auto',
-												        initialValue: result,
-												        language:"zh",
+														el: document.querySelector('#md'),
+														initialEditType: 'markdown',
+														previewStyle: 'vertical',
+														height: 'auto',
+														initialValue: result,
+														language:"zh",
 												});

 												toastr.clear();
@@ -154,7 +154,7 @@

 		function audioPause() {
 			document.getElementById('audiopreview-target').pause();
-			document.getElementById('videopreview-target').pause();
+			dp.pause()
 		}

 		
@@ -190,6 +190,39 @@
 				openPhotoSwipe(t);
 			}
 		}
+		vplayderLoad = false;
+		var loadDPlayer = function(url){
+			if (!vplayderLoad) {
+				toastr["info"]("加载预览组件...");
+				includeCss("/static/css/DPlayer.min.css");
+				$.getScript("/static/js/DPlayer.min.js").done(function() {
+					toastr.clear();
+					vplayderLoad = 1;
+					playVideo(url);
+				});
+			}else{
+				playVideo(url);
+			}
+		}
+		var playVideo = function(url){
+			 dp = new DPlayer({
+				container: document.getElementById("videopreview-target"),
+				screenshot: true,
+				video: {
+					url: url
+				},
+			});
+			dp.on("fullscreen", function(){
+				$(".modal-backdrop").hide();
+				$("#side").hide();
+				return false;
+			});
+			dp.on("fullscreen_cancel", function(){
+				$(".modal-backdrop").show();
+				$("#side").show();
+				return false;
+			})
+		}
 		function suffix($fname){
 			alert($fname);
 		}	
@@ -198,15 +231,15 @@
 			$('a[ng-click|="selectOrUnselect(item, $event)"]').click(function(event){ 
 				var menu = $("#context-menu");
 				if (event.pageX >= window.innerWidth - menu.width()) {
-				            event.pageX -= menu.width();
-				        }
-				        if (event.pageY >= window.innerHeight - menu.height()) {
-				            event.pageY -= menu.height();
-				        }
+							event.pageX -= menu.width();
+						}
+						if (event.pageY >= window.innerHeight - menu.height()) {
+							event.pageY -= menu.height();
+						}
 				  $("#context-menu").css({
-                        "left": event.pageX,
-                        "top": event.pageY
-                    });
+						"left": event.pageX,
+						"top": event.pageY
+					});
 				$(this).contextmenu();
 				return false;
 			})
@@ -26,8 +26,13 @@ changeColor("#4e64d9","#3f51b5");
 $(".captcha_img").click(function() {
 	$("[alt='captcha']:visible").attr('src', "/captcha");
 })
+function updateMetaThemeColor(themeColor) {
+    $('meta[name=theme-color]').remove();
+    $('head').append('<meta name="theme-color" content="'+themeColor+'">');
+}
 function switchToReg(){
 	changeColor("#46adff","#2196F3");
+	updateMetaThemeColor("#2196F3");
 	$("#logForm").hide();
 	$("#regForm").show();
 	$("[alt='captcha']:visible").attr('src', "/captcha");
@@ -36,6 +41,7 @@ function switchToReg(){
 }
 function switchToLog(){
 	changeColor("#4e64d9","#3f51b5");
+	updateMetaThemeColor("#3f51b5");
 	$("#regForm").hide();
 	$("#forgetForm").hide();
 	$("#logForm").show();
@@ -45,6 +51,7 @@ function switchToLog(){
 }
 function switchToEmail(){
 	changeColor("#009688","#4CAF50");
+	updateMetaThemeColor("#4CAF50");
 	$("#regForm").hide();
 	$("#emailCheck").show();
 	$("#emailCheck").removeClass("animated zoomIn");
@@ -52,6 +59,7 @@ function switchToEmail(){
 }
 function switchToForget(){
 	changeColor("#FF9800","#F44336");
+	updateMetaThemeColor("#F44336");	
 	$("#regForm").hide();
 	$("#logForm").hide();
 	$("#forgetForm").show();
@@ -21,6 +21,14 @@
                    }),
                });
            }]);
+            function includeCss(filename) {
+                var head = document.getElementsByTagName('head')[0];
+                var link = document.createElement('link');
+                link.href = filename;
+                link.rel = 'stylesheet';
+                link.type = 'text/css';
+                head.appendChild(link)
+            }
            previewLoad = 0;
            var openPhotoSwipe = function(items) {
                var pswpElement = document.querySelectorAll('.pswp')[0];
@@ -56,6 +64,39 @@
                openPhotoSwipe(t);
            }
        }
+        vplayderLoad = false;
+        var loadDPlayer = function(url){
+            if (!vplayderLoad) {
+                toastr["info"]("加载预览组件...");
+                includeCss("/static/css/DPlayer.min.css");
+                $.getScript("/static/js/DPlayer.min.js").done(function() {
+                    toastr.clear();
+                    vplayderLoad = 1;
+                    playVideo(url);
+                });
+            }else{
+                playVideo(url);
+            }
+        }
+        var playVideo = function(url){
+             dp = new DPlayer({
+                container: document.getElementById("videopreview-target"),
+                screenshot: true,
+                video: {
+                    url: url
+                },
+            });
+            dp.on("fullscreen", function(){
+                $(".modal-backdrop").hide();
+                $("#side").hide();
+                return false;
+            });
+            dp.on("fullscreen_cancel", function(){
+                $(".modal-backdrop").show();
+                $("#side").show();
+                return false;
+            })
+        }
        function mobileBind(){
            if($(window).width()<768){
            $('a[ng-click|="selectOrUnselect(item, $event)"]').click(function(event){ 
@@ -14,8 +14,8 @@

            });
            jQuery.ajaxSetup({
-            cache: true
-        });
+                cache: true
+            });

            function getSize(size) {
                var filetype = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
@@ -25,33 +25,20 @@
                }
                return parseInt(size * 100) / 100 + filetype[i];
            }
-            Date.prototype.format = function(fmt) {
-                var o = {
-                    "M+": this.getMonth() + 1, 
-                    "d+": this.getDate(),
-                    "h+": this.getHours(), 
-                    "m+": this.getMinutes(), 
-                    "s+": this.getSeconds(), 
-                    "q+": Math.floor((this.getMonth() + 3) / 3), 
-                    "S": this.getMilliseconds()
-                };
-                if (/(y+)/.test(fmt)) {
-                    fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-                }
-                for (var k in o) {
-                    if (new RegExp("(" + k + ")").test(fmt)) {
-                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-                    }
-                }
-                return fmt;
+            function formateDate(dateString){
+                var bigDate = dateString.split(" ");
+                var smallDate = bigDate[0].split("-");
+                return smallDate[0]+"年"+smallDate[1]+"月"+smallDate[2]+"日 "+bigDate[1];
            }
+
            function audioPause() {
                document.getElementById('preview-target').pause();
+                dp.pause();
            }
            $("#size").html(getSize(shareInfo.fileSize));
            $("#down_num").html(shareInfo.downloadNum);
            $("#view_num").html(shareInfo.ViewNum);
-            shareTime = new Date(shareInfo.shareDate).format("yyyy年MM月dd日 hh:mm");
+            shareTime = formateDate(shareInfo.shareDate);
            $("#share_time").html(shareTime);
            $("#download").click(function() {
                $.post("/Share/getDownloadUrl", {
@@ -64,16 +51,59 @@
                    }
                });
            });
-            var openPhotoSwipe = function(pic,ww,hh) {
+            vplayderLoad = false;
+        function includeCss(filename) {
+            var head = document.getElementsByTagName('head')[0];
+            var link = document.createElement('link');
+            link.href = filename;
+            link.rel = 'stylesheet';
+            link.type = 'text/css';
+            head.appendChild(link)
+        }
+        var loadDPlayer = function(url){
+            if (!vplayderLoad) {
+                toastr["info"]("加载预览组件...");
+                includeCss("/static/css/DPlayer.min.css");
+                $.getScript("/static/js/DPlayer.min.js").done(function() {
+                    toastr.clear();
+                    vplayderLoad = 1;
+                    playVideo(url);
+                });
+            }else{
+                playVideo(url);
+            }
+        }
+        var playVideo = function(url){
+             dp = new DPlayer({
+                container: document.getElementById("preview-target"),
+                screenshot: true,
+                video: {
+                    url: url
+                },
+                danmaku: {
+                       id: 'Cloudreve_'+shareInfo.shareId,
+                       api: 'https://api.prprpr.me/dplayer/'
+                }
+            });
+            dp.on("fullscreen", function(){
+                $(".modal-backdrop").hide();
+                $("#side").hide();
+                return false;
+            });
+            dp.on("fullscreen_cancel", function(){
+                $(".modal-backdrop").show();
+                $("#side").show();
+                return false;
+            })
+        }
+            var openPhotoSwipe = function(pic, ww, hh) {
                var pswpElement = document.querySelectorAll('.pswp')[0];
-                items= [
-                        {
-                            src: pic,
-                            w: ww,
-                            h: hh
-                        }
-                    ];
-                     var options = {
+                items = [{
+                    src: pic,
+                    w: ww,
+                    h: hh
+                }];
+                var options = {
                    history: false,
                    focus: false,
                    showAnimationDuration: 5,
@@ -86,57 +116,57 @@
                var gallery = new PhotoSwipe(pswpElement, PhotoSwipeUI_Default, items, options);
                gallery.init();
            };
-            if(/\.(gif|jpg|jpeg|png|svg|SVG|GIF|JPG|PNG)$/.test(shareInfo.fileName)){
+
+            if (/\.(gif|jpg|jpeg|png|svg|SVG|GIF|JPG|PNG)$/.test(shareInfo.fileName)) {
                $.getScript("/static/js/photoswipe.min.js").done(function() {
                    $.getScript("/static/js/photoswipe-ui-default.js").done(function() {
-                        $("#previewButton").click(function(){
-                            if(shareInfo.allowPreview){
+                        $("#previewButton").click(function() {
+                            if (shareInfo.allowPreview) {
                                x = shareInfo.picSize.split(",")[0];
                                y = shareInfo.picSize.split(",")[1];
-                                openPhotoSwipe("/Share/Preview/"+shareInfo.shareId,x,y);
-                            }else{
+                                openPhotoSwipe("/Share/Preview/" + shareInfo.shareId, x, y);
+                            } else {
                                toastr["error"]("请先登录")
                            }
                        })
-                        
+
                    })

                })
-            }else if(/\.(mp4|flv|avi|tff|MP4|FLV|AVI|TFF)$/.test(shareInfo.fileName)){
+            } else if (/\.(mp4|flv|avi|tff|MP4|FLV|AVI|TFF)$/.test(shareInfo.fileName)) {
                $(".file-sign").html('<i class="fa fa-file-movie-o" aria-hidden="true"></i>')
-                $("#previewButton").click(function(){
-                    if(shareInfo.allowPreview){
-                        $(".previewContent").html('<video id="preview-target" style="width: 100%;object-fit: fill" controls="controls" class="preview"  src="/Share/Preview/'+shareInfo.shareId+'" ></video>');
+                $("#previewButton").click(function() {
+                    if (shareInfo.allowPreview) {
+                        $(".previewContent").html('<div id="preview-target" style="width: 100%;object-fit: fill;height:400px" class="preview"></div>');
+                        loadDPlayer('/Share/Preview/' + shareInfo.shareId);
                        $('#previewModal').modal();
-                    }else{
+                    } else {
                        toastr["error"]("请先登录")
                    }
                })
-            }
-            else if(/\.(MP3|mp3|wav|WAV|ogg|OGG)$/.test(shareInfo.fileName)){
+            } else if (/\.(MP3|mp3|wav|WAV|ogg|OGG)$/.test(shareInfo.fileName)) {
                $(".file-sign").html('<i class="fa fa-file-audio-o" aria-hidden="true"></i>');
-                $("#previewButton").click(function(){
-                    if(shareInfo.allowPreview){
-                        $(".previewContent").html('<audio id="preview-target" style="width: 100%;object-fit: fill" controls="controls" class="preview"  src="/Share/Preview/'+shareInfo.shareId+'" ></audio>');
+                $("#previewButton").click(function() {
+                    if (shareInfo.allowPreview) {
+                        $(".previewContent").html('<audio id="preview-target" style="width: 100%;object-fit: fill" controls="controls" class="preview"  src="/Share/Preview/' + shareInfo.shareId + '" ></audio>');
                        $('#previewModal').modal();
-                    }else{
+                    } else {
                        toastr["error"]("请先登录")
                    }
                })
-            }else{
-                 $("#previewButton").click(function(){
-                     toastr["warning"]("当前文件暂不支持预览")
-                 });
-                 if(/\.(doc|DOC|docx|DOCX|ogg)$/.test(shareInfo.fileName)){
-                     $(".file-sign").html('<i class="fa fa-file-word-o" aria-hidden="true"></i>');
-                 }else if(/\.(ppt|PPT|pptx|PPTX)$/.test(shareInfo.fileName)){
+            } else {
+                $("#previewButton").click(function() {
+                    toastr["warning"]("当前文件暂不支持预览")
+                });
+                if (/\.(doc|DOC|docx|DOCX|ogg)$/.test(shareInfo.fileName)) {
+                    $(".file-sign").html('<i class="fa fa-file-word-o" aria-hidden="true"></i>');
+                } else if (/\.(ppt|PPT|pptx|PPTX)$/.test(shareInfo.fileName)) {
                    $(".file-sign").html('<i class="fa fa-file-powerpoint-o" aria-hidden="true"></i>');
-                 }else if(/\.(pdf|PDF)$/.test(shareInfo.fileName)){
+                } else if (/\.(pdf|PDF)$/.test(shareInfo.fileName)) {
                    $(".file-sign").html('<i class="fa fa-file-pdf-o" aria-hidden="true"></i>');
-                 }
-                 else if(/\.(zip|ZIP|RAR|rar|7z|7Z)$/.test(shareInfo.fileName)){
+                } else if (/\.(zip|ZIP|RAR|rar|7z|7Z)$/.test(shareInfo.fileName)) {
                    $(".file-sign").html('<i class="fa fa-file-archive-o" aria-hidden="true"></i>');
-                 }else{
+                } else {
                    $(".file-sign").html('<i class="fa fa-file-text" aria-hidden="true"></i>');
-                 }
+                }
            }
Author	SHA1	Message	Date
HFO4	7d5e8fb2a1	1.0.3	2018-03-11 11:42:38 +08:00
HFO4	956deac89f	数据库升级逻辑	2018-03-11 11:39:33 +08:00
HFO4	4964f53dac	视频预览支持弹幕	2018-03-09 21:01:40 +08:00
AaronLiuandGitHub	037e6ad0b3	Update README.md	2018-03-08 22:44:06 +08:00
AaronLiuandGitHub	9c7494256c	Update README.md	2018-03-08 22:43:18 +08:00
HFO4	21518300b4	定义移动端导航栏主题色	2018-03-07 20:07:25 +08:00
HFO4	99759b5a77	Fix #35	2018-03-05 19:20:12 +08:00
HFO4	d58b824d8b	Fix #32	2018-03-05 19:09:19 +08:00
HFO4	33e56ca287	Merge branch 'master' of https://github.com/HFO4/Cloudreve	2018-03-05 19:03:37 +08:00
HFO4	c7901d55f0	修复 #25	2018-03-05 19:03:11 +08:00
AaronLiuandGitHub	53d01e5f6e	Merge pull request #34 from Instrye/patch-1 修复 JS 获取 change 错误	2018-03-01 17:35:41 +08:00
InstryeandGitHub	4b58719e7c	修复 JS 获取 change 错误	2018-03-01 17:24:40 +08:00
AaronLiuandGitHub	a82bee0216	Merge pull request #33 from Instrye/patch-1 修复 Admin删除分享文件的JS错误	2018-03-01 17:07:23 +08:00
InstryeandGitHub	0ea0902059	修复 Admi n删除分享文件的JS错误修复 JQuery 获取 delete 对象错误	2018-03-01 17:05:05 +08:00
HFO4	a57dd79319	添加oss策略时加上http的提示	2018-02-19 17:55:16 +08:00
HFO4	228b898e9d	登录状态下访问首页跳转到文件页	2018-02-19 15:51:37 +08:00
HFO4	8f8b9df5a5	补齐.htaccess	2018-02-19 13:00:52 +08:00
HFO4	36925a63ef	删除锁文件	2018-02-18 21:51:00 +08:00
HFO4	df03461892	更新readme	2018-02-18 21:49:07 +08:00
HFO4	6361d4bd2e	修复二步验证二维码错误	2018-02-18 21:47:15 +08:00
AaronLiuandGitHub	937dfc77fd	Merge pull request #18 from LinEvil/patch-1 Update TwoFactor.php	2018-02-18 21:34:43 +08:00
LinEvilandGitHub	31f1eb839f	Update TwoFactor.php 安装的依赖endroid/qrcode已经弃用请使用composer require endroid/qr-code	2018-02-18 21:32:18 +08:00
HFO4	12f7f691eb	修复因目录重名无法创建目录	2018-02-18 21:08:19 +08:00
HFO4	2d183acd0d	测试自动构建	2018-02-18 19:46:43 +08:00
HFO4	363da22bda	测试自动构建	2018-02-18 19:42:12 +08:00
HFO4	28d8d02508	测试自动构建	2018-02-18 19:39:50 +08:00
HFO4	662c3019d4	更新deploy.sh	2018-02-18 19:24:14 +08:00
HFO4	f5502b3666	添加自动打包	2018-02-18 19:20:06 +08:00
HFO4	4e550dcdb2	修复nginx无法使用sendfile	2018-02-16 11:59:09 +08:00
HFO4	59f8a9b58d	更新数据库版本	2018-02-16 10:46:07 +08:00
HFO4	b0898fcab4	支持通过sendfile下载文件	2018-02-16 10:31:53 +08:00
HFO4	8c8561dc31	拼写错误	2018-02-15 21:12:24 +08:00
HFO4	141de8ba54	修复部分情况加WebDAV无法使用	2018-02-15 21:08:26 +08:00
HFO4	159098decf	初步添加sendfile支持	2018-02-15 20:28:25 +08:00
HFO4	24789ca8a9	更新版本号	2018-02-14 18:11:57 +08:00
HFO4	544769bf04	Fix #12	2018-02-13 17:20:36 +08:00
HFO4	85119bc54d	新增发送安装反馈	2018-02-13 16:44:51 +08:00
HFO4	d3061f0526	README特性更新	2018-02-13 16:31:21 +08:00
HFO4	4492991bbb	修复一处url错误	2018-02-13 16:28:19 +08:00
HFO4	1e79428425	新增远程上传策略	2018-02-13 16:11:15 +08:00
HFO4	c28f08c210	自定远程服务端（未完成）	2018-02-10 14:14:40 +08:00
rainays	0e0f7d5258	添加登录按钮	2018-02-08 22:18:10 +08:00
HFO4	d2ca69b945	视频预览使用Dplayer	2018-02-07 14:40:46 +08:00
HFO4	9cb572f0da	clear cache	2018-02-06 18:56:51 +08:00
HFO4	9994f12aa8	clear cache	2018-02-06 18:56:09 +08:00
HFO4	20b7d67adc	修复目录分享无法使用	2018-02-06 18:55:04 +08:00
HFO4	63cc404d74	修复目录分享无法使用	2018-02-06 18:54:08 +08:00
HFO4	47f334b6f4	修复部分服务器无法收到回调Authorization头	2018-02-06 17:34:49 +08:00
HFO4	1431f433d1	修复首页背景适应	2018-02-06 17:08:16 +08:00
HFO4	b6c1382e73	修复某些情况下验证码无效	2018-02-05 16:28:30 +08:00
HFO4	02ce111717	修复部分情况下安装报错	2018-02-05 13:59:19 +08:00