diff --git a/application/default/controllers/VisualController.php b/application/default/controllers/VisualController.php
index eea08e08..49fd4624 100644
--- a/application/default/controllers/VisualController.php
+++ b/application/default/controllers/VisualController.php
@@ -1,117 +1,115 @@
-<?php
-use Westdc\Visual;
-use Westdc\Metadata;
-use Helpers\View as view;
-
-class VisualController extends Zend_Controller_Action 
-{
-   
-    function preDispatch()
-    {
-    	$this->view->config = Zend_Registry::get('config');
-    	$this->db=Zend_Registry::get('db');
-	$this->view->nav = array(
-			array('link'=>'/','title'=>'<i class="icon-home"></i>'),
-			array('link'=>'/data','title'=>$this->view->config->title->data),
-		);
-
-		$auth = Zend_Auth::getInstance();
-		if($auth->hasIdentity())
-		{
-			$user = $auth->getIdentity();
-			$this->uid = $user->id;
-		}else{
-			$this->_redirect('/account/login?href=/visual');
-		}
-    }
-	
-	function indexAction()
-	{
-		$record_type = $this->_getParam("dataset");
-		
-		if(empty($record_type))
-			return true;
-		
-		$sc = Factory::Bootstrap($record_type);
-	}
-	
-	
-	//********************************************************
-	
-	/*
-	* dataAction() ajax获取数据
-	*
-	* param string $ac 				//请求的数据类型
-	* param string $dt				//请求的数据来源(气象，水文)
-	*
-	* return view
-	*/
-	function dataAction()
-	{
-		$this->_helper->viewRenderer->setNoRender();
-        $this->_helper->layout->disableLayout();
-		
-		$uuid = $this->_getParam("uuid");
-		$record_type = $this->_getParam("dataset");
-		$record_subset = $this->_getParam("subdataset");
-		
-		if(empty($record_type))
-			return true;
-		
-		$record = new Visual\Record($uuid,$record_subset);
-		//$record = Visual\Factory::Bootstrap($record_type);
-		
-		if(!empty($record_subset))
-		{
-			$record->subset = $record_subset;
-		}
-		
-		$data = $record();
-		
-		$this->jsonexit($data);
-		return true;
-		
-	}//dataAction() Ajax获取数据
-	
-	//viewAction
-	public function viewAction()
-	{
-		$uuid = $this->_getParam('uuid');
-		
-		if(empty($uuid) || \Helpers\Uuid::test($uuid) == false)
-		{
-			view::Post($this,"参数错误",-1);
-			return;
-		}
-		
-		$visual = new Visual\Visual;
-		
-		$this->view->data = $visual->getVisualVars($uuid);
-		
-		if(empty($this->view->data))
-		{
-			view::Post($this,"此数据不支持可视化",-1);
-			return;
-		}
-		
-		$metadata = new Metadata\Metadata;
-		
-		$this->view->info = $metadata->view($uuid);
-		
-		
-	}
-	
-	
-	/*
-    * jsonexit() 退出并返回json数据
-    *
-    * param array $data		要返回的JSON数据，可以是任意数组
-    *
-	* return application/JSON
-    */
-	public function jsonexit($data){
-		$this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK));
-		return true;  
-	}//jsonexit() 退出并返回json数据
- 
+<?php
+use Westdc\Visual;
+use Westdc\Metadata;
+use Helpers\View as view;
+
+class VisualController extends Zend_Controller_Action 
+{
+   
+    function preDispatch()
+    {
+    	$this->view->config = Zend_Registry::get('config');
+    	$this->db=Zend_Registry::get('db');
+		$this->view->nav = array(
+			array('link'=>'/','title'=>'<i class="icon-home"></i>'),
+			array('link'=>'/data','title'=>$this->view->config->title->data),
+		);
+		
+		if(view::User() === false)
+		{
+			view::Post($this,"请先登陆",'/account/login?href='.urlencode($_SERVER['REQUEST_URI']));
+		}
+		
+		$this->uid = view::User('id');
+    }
+	
+	function indexAction()
+	{
+		$record_type = $this->_getParam("dataset");
+		
+		if(empty($record_type))
+			return true;
+		
+		$sc = Factory::Bootstrap($record_type);
+	}
+	
+	
+	//********************************************************
+	
+	/*
+	* dataAction() ajax获取数据
+	*
+	* param string $ac 				//请求的数据类型
+	* param string $dt				//请求的数据来源(气象，水文)
+	*
+	* return view
+	*/
+	function dataAction()
+	{
+		$this->_helper->viewRenderer->setNoRender();
+        $this->_helper->layout->disableLayout();
+		
+		$uuid = $this->_getParam("uuid");
+		$record_type = $this->_getParam("dataset");
+		$record_subset = $this->_getParam("subdataset");
+		
+		if(empty($record_type))
+			return true;
+		
+		$record = new Visual\Record($uuid,$record_subset);
+		//$record = Visual\Factory::Bootstrap($record_type);
+		
+		if(!empty($record_subset))
+		{
+			$record->subset = $record_subset;
+		}
+		
+		$data = $record();
+		
+		$this->jsonexit($data);
+		return true;
+		
+	}//dataAction() Ajax获取数据
+	
+	//viewAction
+	public function viewAction()
+	{
+		$uuid = $this->_getParam('uuid');
+		
+		if(empty($uuid) || \Helpers\Uuid::test($uuid) == false)
+		{
+			view::Post($this,"参数错误",-1);
+			return;
+		}
+		
+		$visual = new Visual\Visual;
+		
+		$this->view->data = $visual->getVisualVars($uuid);
+		
+		if(empty($this->view->data))
+		{
+			view::Post($this,"此数据不支持可视化",-1);
+			return;
+		}
+		
+		$metadata = new Metadata\Metadata;
+		
+		$this->view->info = $metadata->view($uuid);
+		
+		
+	}
+	
+	
+	/*
+    * jsonexit() 退出并返回json数据
+    *
+    * param array $data		要返回的JSON数据，可以是任意数组
+    *
+	* return application/JSON
+    */
+	public function jsonexit($data){
+		$this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK));
+		return true;  
+	}//jsonexit() 退出并返回json数据
+ 
 }
\ No newline at end of file
diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index 471b1c8f..0822f124 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -60,7 +60,7 @@
         <h4>数据最近更新  <a href="/service/feed" target="_blank"><i class="icon-rss"></i></a></h4>
         <ul class="unstyled">
             <?php foreach($this->metadata as $md) : ?>
-            <li><a href="/data/<?php echo $md['uuid'];?>"><i class="icon-map-marker"> </i><?php echo $this->escape($md['title']);?></a><small class="pull-right">[<?= date('Y-m-d',strtotime($md['ts_created'])) ?>]</small></li>
+            <li><a href="/data/<?php echo $md['uuid'];?>"><i class="icon-map-marker"> </i><?php echo $this->escape($md['title']);?></a>  <small>[<?= date('Y-m-d',strtotime($md['ts_created'])) ?>]</small></li>
             <?php endforeach; ?>
         </ul>
 </div>
diff --git a/application/models/ApplicantPDF.php b/application/models/ApplicantPDF.php
index 96d68501..be1073f5 100644
--- a/application/models/ApplicantPDF.php
+++ b/application/models/ApplicantPDF.php
@@ -25,7 +25,7 @@ class ApplicantPDF extends FPDI
 		$this->addPage();
 		$this->useTemplate($tplidx);
 		$this->SetFont('ugb','',$this->fontsize);
-		$this->setXY(74,43);
+		$this->setXY(86,41.5);
 		$this->Write($this->fontsize,$this->data['realname']);
 		$this->SetXY(34,55);
 		$this->MultiCell (166, 4, str_replace(";","\n",$this->data['westdclist']));
@@ -33,18 +33,18 @@ class ApplicantPDF extends FPDI
 		$this->MultiCell(166,4,trim($this->data['project']));
 		//$this->setXY(34,239);
 		//$this->Write($this->fontsize,$this->data['realname']);
-		$this->setXY(32,223);
+		$this->setXY(32,222);
 		$this->Write($this->fontsize,$this->data['unit']);
-		$this->setXY(112,223);
+		$this->setXY(112,222);
 		$this->Write($this->fontsize,$this->data['email']);
-		$this->setXY(174,223);
+		$this->setXY(174,222);
 		$this->Write($this->fontsize,$this->data['postcode']);
-		$this->setXY(32,230);
+		$this->setXY(32,228);
 		$this->Write($this->fontsize,$this->data['address']);
-		$this->setXY(112,230);
+		$this->setXY(112,228);
 		$this->Write($this->fontsize,$this->data['phone']);
 		$t=date("Y-m-d");
-		$this->setXY(174,230);
+		$this->setXY(174,228);
 		$this->Write($this->fontsize,$t);
 	}
 	function drawHeihe()
diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php
index cf9ba966..c55a7be5 100644
--- a/application/module/Order/Order.php
+++ b/application/module/Order/Order.php
@@ -312,17 +312,7 @@ class Order
 	public function pdfPrint($formData,$userid = 0,$save = false,$returnpdf = false)
 	{
 		$sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d 
-			  RIGHT JOIN heihemetadata m ON d.uuid=m.uuid 
-			  WHERE d.status=2 AND d.userid=?";
-		
-		$list = $this->db->fetchAll($sql,array($userid));
-		
-		foreach($list as $i=>$row){
-			@$formData['heihelist'].=($i+1).". ".$row['title'].";";
-		}
-		
-		$sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d 
-			  RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.uuid not in (select uuid from heihemetadata) AND d.status=2 AND d.userid=?";
+			  RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.status=2 AND d.userid=?";
 		$list = $this->db->fetchAll($sql,array($userid));
 		
 		foreach($list as $i=>$row){
diff --git a/application/sync.php b/application/sync.php
deleted file mode 100644
index fe84f941..00000000
--- a/application/sync.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-//sync seekspace data
-error_reporting(E_ALL|E_STRICT);
-ini_set('display_errors', 1);
-date_default_timezone_set('Asia/Shanghai');
-
-// directory setup and class loading
-set_include_path('.' . PATH_SEPARATOR . '../include/'
-     . PATH_SEPARATOR . '../application/models'
-     . PATH_SEPARATOR . '../application/default/controllers'
-     . PATH_SEPARATOR . get_include_path());
-include "Zend/Loader.php";
-Zend_Loader::registerAutoload();
-$config = new Zend_Config_Ini('config.ini', 'general');
-$db = Zend_Db::factory($config->db);
-Zend_Db_Table::setDefaultAdapter($db);
-    	$sql="select item_id,title from knl_article";
-    	$rs=$db->fetchAll($sql);
-    	foreach($rs as $r)
-    	{
-    		$sql="select item_id,place,keyword from knl_keyword where item_id=?";
-    		$rs1=$db->fetchAll($sql,array($r['item_id']));
-    		foreach($rs1 as $r1)
-    		{
-    			$sql="update knl_article set keywords[?]=? where item_id=?";
-    			$db->query($sql,array($r1['place'],$r1['keyword'],$r1['item_id']));
-    		}
-    		$sql="select item_id,place,author from knl_author where item_id=?";
-    		$rs1=$db->fetchAll($sql,array($r['item_id']));
-    		foreach($rs1 as $r1)
-    		{
-    			$sql="update knl_article set authors[?]=? where item_id=?";
-    			$db->query($sql,array($r1['place'],$r1['author'],$r1['item_id']));
-    		}
-    		print $r['title']."...\n";    		
-    	}
-?>
\ No newline at end of file
diff --git a/data/offline.pdf b/data/offline.pdf
index 251175a3..a090c5bd 100644
Binary files a/data/offline.pdf and b/data/offline.pdf differ
diff --git a/data/security.pdf b/data/security.pdf
index 09e31253..882867dc 100644
Binary files a/data/security.pdf and b/data/security.pdf differ