diff --git a/inc/common.php b/inc/common.php
index abd34e3..47272f9 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -674,7 +674,7 @@ class SESS{
 		header('P3P:CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"'); 
 		//ini_set("session.save_handler","memcache");
 		//ini_set("session.save_path",$_CONFIG['memcache']['ip'].":".$_CONFIG['memcache']['port']);
-		ini_set('session.gc_maxlifetime',3600); 
+		ini_set('session.gc_maxlifetime',86400*7);
 		/*可以修改为使用文件方式保存session
 			ini_set("session.save_handler","files");
 			session_save_path( "session/");
diff --git a/pmcalendar.php b/pmcalendar.php
index 92574cf..1e312fb 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -39,8 +39,11 @@ if ($act == 'newevent') {
     we('1');
 } else if ($act == 'edityunying') {
     $id = r('id');
+    $content = stripslashes(r('content'));
+    $data_array = json_decode($content,true);
+    $data_array['date'] =date("Y-m-d H:i:s");
     $dict = array(
-        'yunying_remark' => stripslashes(r('content'))
+        'yunying_remark' => json_encode($data_array)
     );
 
     $sql = DB::update('calendar', $dict, "id='{$id}'");
@@ -48,8 +51,11 @@ if ($act == 'newevent') {
     we('1');
 } else if ($act == 'edityanfa') {
     $id = r('id');
+    $content = stripslashes(r('content'));
+    $data_array = json_decode($content,true);
+    $data_array['date'] =date("Y-m-d H:i:s");
     $dict = array(
-        'yanfa_remark' => stripslashes(r('content'))
+        'yanfa_remark' => json_encode($data_array)
     );
 
     $sql = DB::update('calendar', $dict, "id='{$id}'");
@@ -57,8 +63,11 @@ if ($act == 'newevent') {
     we('1');
 } else if ($act == 'editchanpin') {
     $id = r('id');
+    $content = stripslashes(r('content'));
+    $data_array = json_decode($content,true);
+    $data_array['date'] =date("Y-m-d H:i:s");
     $dict = array(
-        'chanpin_remark' => stripslashes(r('content'))
+        'chanpin_remark' => json_encode($data_array)
     );
 
     $sql = DB::update('calendar', $dict, "id='{$id}'");