Web 2.8.1 12-6

更新内容：
1 更新安装脚本

bin/GetFile_read.py

@@ -0,0 +1,23 @@
+#/usr/bin/python
+#coding:utf8
+import paramiko,os
+def GetFile(ip,port,username,password,UseKey,sfile,dfile):
+	dfile='/tmp/'+os.path.basename(dfile)
+	try:
+		t=paramiko.Transport((ip,port))
+		if UseKey=="Y":
+			KeyPath=os.path.expanduser('~/.ssh/id_rsa')
+			key=paramiko.RSAKey.from_private_key_file(KeyPath)
+			t.connect(username = username,pkey=key)
+		else:
+			t.connect(username = username,password = password)
+		sftp = paramiko.SFTPClient.from_transport(t)
+		ret=sftp.get(sfile,dfile)
+
+	except Exception,e:
+		print "不能获取获取远程服务器上的文件(%s)"%e
+		return False
+	else:
+		t.close()
+		print "+Get File is OK"
+		return True

bin/auth.sql

@@ -52,4 +52,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-12-04 20:37:03
+-- Dump completed on 2015-12-06  9:46:38

bin/cheungssh.sql

@@ -124,7 +124,7 @@ CREATE TABLE `auth_user` (
 
 LOCK TABLES `auth_user` WRITE;
 /*!40000 ALTER TABLE `auth_user` DISABLE KEYS */;
-INSERT INTO `auth_user` VALUES (1,'cheungssh','','','[email protected]','pbkdf2_sha256$10000$uqPm5KardI5o$5/MSXyYi2PYHMXk5ZbZ6TjsD1C0nxgbLLZBvZ/G/mZw=',1,1,1,'2015-12-03 10:40:39','2015-12-03 09:41:28'),(2,'t','','','','pbkdf2_sha256$10000$WXM9YsebTH7R$9RiM0iqIUumgJRK9zg+TV05oXrRY8zXjLSCzoxgK5/s=',0,1,0,'2015-12-03 10:09:05','2015-12-03 09:42:24');
+INSERT INTO `auth_user` VALUES (1,'cheungssh','','','[email protected]','pbkdf2_sha256$10000$dx7FZocLn2oq$mabr888RKSjOjzOeR4vjxvxRomhA3cWCqiNS4pGYi+A=',1,1,1,'2015-12-06 01:45:17','2015-12-03 09:41:28');
 /*!40000 ALTER TABLE `auth_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -179,7 +179,6 @@ CREATE TABLE `auth_user_user_permissions` (
 
 LOCK TABLES `auth_user_user_permissions` WRITE;
 /*!40000 ALTER TABLE `auth_user_user_permissions` DISABLE KEYS */;
-INSERT INTO `auth_user_user_permissions` VALUES (125,2,50),(123,2,25),(124,2,26);
 /*!40000 ALTER TABLE `auth_user_user_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -321,7 +320,7 @@ CREATE TABLE `django_admin_log` (
   PRIMARY KEY (`id`),
   KEY `django_admin_log_fbfc09f1` (`user_id`),
   KEY `django_admin_log_e4470c6e` (`content_type_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -330,7 +329,7 @@ CREATE TABLE `django_admin_log` (
 
 LOCK TABLES `django_admin_log` WRITE;
 /*!40000 ALTER TABLE `django_admin_log` DISABLE KEYS */;
-INSERT INTO `django_admin_log` VALUES (1,'2015-12-03 09:42:24',1,3,'2','t',1,''),(2,'2015-12-03 09:42:42',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(3,'2015-12-03 09:48:35',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(4,'2015-12-03 10:00:17',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(5,'2015-12-03 10:01:17',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(6,'2015-12-03 10:05:00',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(7,'2015-12-03 10:11:03',1,3,'2','t',2,'已修改 password 和 user_permissions 。');
+INSERT INTO `django_admin_log` VALUES (1,'2015-12-03 09:42:24',1,3,'2','t',1,''),(2,'2015-12-03 09:42:42',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(3,'2015-12-03 09:48:35',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(4,'2015-12-03 10:00:17',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(5,'2015-12-03 10:01:17',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(6,'2015-12-03 10:05:00',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(7,'2015-12-03 10:11:03',1,3,'2','t',2,'已修改 password 和 user_permissions 。'),(8,'2015-12-05 11:42:00',1,3,'2','t',3,'');
 /*!40000 ALTER TABLE `django_admin_log` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -383,7 +382,7 @@ CREATE TABLE `django_session` (
 
 LOCK TABLES `django_session` WRITE;
 /*!40000 ALTER TABLE `django_session` DISABLE KEYS */;
-INSERT INTO `django_session` VALUES ('6046062f0e44cba3fa7d2c25dceae0b1','YWVhYTgzZDMxMjljZjA5NmI5MzQyNDQ3YWRiNzI1YTcwODU3NjJkNTqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ1fYXV0aF91c2VyX2lkcQSKAQFVEl9hdXRoX3VzZXJfYmFja2Vu\nZHEFVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEGVQ9fc2Vzc2lv\nbl9leHBpcnlxB0sAdS4=\n','2015-12-17 10:40:39'),('747059c12bfe4a9b036fd5ddaba303fc','NTViZjNkMWY3YmEyMzhmZTAwYzVlZjU5NWRiNzAyNTE5YjQwNGZkMTqAAn1xAShVCHVzZXJuYW1l\ncQJYAQAAAHRVD19zZXNzaW9uX2V4cGlyeXEDSwBVEl9hdXRoX3VzZXJfYmFja2VuZHEEVSlkamFu\nZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEFVQ1fYXV0aF91c2VyX2lkcQaK\nAQJ1Lg==\n','2015-12-17 09:42:56'),('66c85d372c328c179ebdbe3779096304','NTViZjNkMWY3YmEyMzhmZTAwYzVlZjU5NWRiNzAyNTE5YjQwNGZkMTqAAn1xAShVCHVzZXJuYW1l\ncQJYAQAAAHRVD19zZXNzaW9uX2V4cGlyeXEDSwBVEl9hdXRoX3VzZXJfYmFja2VuZHEEVSlkamFu\nZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEFVQ1fYXV0aF91c2VyX2lkcQaK\nAQJ1Lg==\n','2015-12-17 09:58:02'),('68c9a3b68f3643a33bbaca9d80e95060','NTViZjNkMWY3YmEyMzhmZTAwYzVlZjU5NWRiNzAyNTE5YjQwNGZkMTqAAn1xAShVCHVzZXJuYW1l\ncQJYAQAAAHRVD19zZXNzaW9uX2V4cGlyeXEDSwBVEl9hdXRoX3VzZXJfYmFja2VuZHEEVSlkamFu\nZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEFVQ1fYXV0aF91c2VyX2lkcQaK\nAQJ1Lg==\n','2015-12-17 10:09:05');
+INSERT INTO `django_session` VALUES ('6046062f0e44cba3fa7d2c25dceae0b1','YWVhYTgzZDMxMjljZjA5NmI5MzQyNDQ3YWRiNzI1YTcwODU3NjJkNTqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ1fYXV0aF91c2VyX2lkcQSKAQFVEl9hdXRoX3VzZXJfYmFja2Vu\nZHEFVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEGVQ9fc2Vzc2lv\nbl9leHBpcnlxB0sAdS4=\n','2015-12-17 10:40:39'),('747059c12bfe4a9b036fd5ddaba303fc','NTViZjNkMWY3YmEyMzhmZTAwYzVlZjU5NWRiNzAyNTE5YjQwNGZkMTqAAn1xAShVCHVzZXJuYW1l\ncQJYAQAAAHRVD19zZXNzaW9uX2V4cGlyeXEDSwBVEl9hdXRoX3VzZXJfYmFja2VuZHEEVSlkamFu\nZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEFVQ1fYXV0aF91c2VyX2lkcQaK\nAQJ1Lg==\n','2015-12-17 09:42:56'),('66c85d372c328c179ebdbe3779096304','NTViZjNkMWY3YmEyMzhmZTAwYzVlZjU5NWRiNzAyNTE5YjQwNGZkMTqAAn1xAShVCHVzZXJuYW1l\ncQJYAQAAAHRVD19zZXNzaW9uX2V4cGlyeXEDSwBVEl9hdXRoX3VzZXJfYmFja2VuZHEEVSlkamFu\nZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEFVQ1fYXV0aF91c2VyX2lkcQaK\nAQJ1Lg==\n','2015-12-17 09:58:02'),('68c9a3b68f3643a33bbaca9d80e95060','NTViZjNkMWY3YmEyMzhmZTAwYzVlZjU5NWRiNzAyNTE5YjQwNGZkMTqAAn1xAShVCHVzZXJuYW1l\ncQJYAQAAAHRVD19zZXNzaW9uX2V4cGlyeXEDSwBVEl9hdXRoX3VzZXJfYmFja2VuZHEEVSlkamFu\nZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEFVQ1fYXV0aF91c2VyX2lkcQaK\nAQJ1Lg==\n','2015-12-17 10:09:05'),('c06364514871a4521ee8df260fe91eb9','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-18 03:22:33'),('3a24d6a635ad291afd80a6d138268434','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-18 04:36:11'),('12f554d8bbefc9a72694d23d35b75428','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-18 04:37:15'),('89cd8384acd1360487ae741adb04adaf','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-18 07:25:53'),('e8ad03e6559ec3701142eb0724aa306c','ZWUwZTllMGQ2NDkzYjcxMTVmNWRkZmI1MTg5YjVlOTE3NDQ4Y2NhNzqAAn1xAShVEl9hdXRoX3Vz\nZXJfYmFja2VuZHECVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHED\nVQ1fYXV0aF91c2VyX2lkcQSKAQF1Lg==\n','2015-12-19 03:09:27'),('4f50ee2ff8c71addb67f217bab321cd5','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-19 05:32:53'),('76095730f36d5b330ab44dceb5f6aabe','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-19 11:12:46'),('3f926c73d478580e6975cfd23760ba3e','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-19 11:23:57'),('dc3d14cc5dbdc3566f812685928068c0','ZTJjNTY1Yzk2ZWFhY2Q0ODBiZDJmNGRlNTE3YTY5ZDhjMzNkYTVlMjqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ9fc2Vzc2lvbl9leHBpcnlxBEsAVRJfYXV0aF91c2VyX2JhY2tl\nbmRxBVUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5kcy5Nb2RlbEJhY2tlbmRxBlUNX2F1dGhf\ndXNlcl9pZHEHigEBdS4=\n','2015-12-19 11:23:57'),('f2494ac6431cd19cc59745bc150a0537','YWVhYTgzZDMxMjljZjA5NmI5MzQyNDQ3YWRiNzI1YTcwODU3NjJkNTqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ1fYXV0aF91c2VyX2lkcQSKAQFVEl9hdXRoX3VzZXJfYmFja2Vu\nZHEFVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEGVQ9fc2Vzc2lv\nbl9leHBpcnlxB0sAdS4=\n','2015-12-19 11:43:30'),('4f571b1afa3a37efbf904e65f8d754b0','ZWUwZTllMGQ2NDkzYjcxMTVmNWRkZmI1MTg5YjVlOTE3NDQ4Y2NhNzqAAn1xAShVEl9hdXRoX3Vz\nZXJfYmFja2VuZHECVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHED\nVQ1fYXV0aF91c2VyX2lkcQSKAQF1Lg==\n','2015-12-19 11:41:44'),('6fd6db373ad210a7cc96719bb80be4b6','YWVhYTgzZDMxMjljZjA5NmI5MzQyNDQ3YWRiNzI1YTcwODU3NjJkNTqAAn1xAShVCHVzZXJuYW1l\ncQJYCQAAAGNoZXVuZ3NzaHEDVQ1fYXV0aF91c2VyX2lkcQSKAQFVEl9hdXRoX3VzZXJfYmFja2Vu\nZHEFVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHEGVQ9fc2Vzc2lv\nbl9leHBpcnlxB0sAdS4=\n','2015-12-19 14:49:45'),('2b6b2229ed31e4f61c33b1bde36a435a','ZWUwZTllMGQ2NDkzYjcxMTVmNWRkZmI1MTg5YjVlOTE3NDQ4Y2NhNzqAAn1xAShVEl9hdXRoX3Vz\nZXJfYmFja2VuZHECVSlkamFuZ28uY29udHJpYi5hdXRoLmJhY2tlbmRzLk1vZGVsQmFja2VuZHED\nVQ1fYXV0aF91c2VyX2lkcQSKAQF1Lg==\n','2015-12-20 01:45:17');
 /*!40000 ALTER TABLE `django_session` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -396,4 +395,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-12-03 18:41:26
+-- Dump completed on 2015-12-06  9:45:56

bin/install-CheungSSH.sh

@@ -4,7 +4,7 @@
 #coding:utf-8
 V=2.0.1
 #如果您在使用过程中，遇到了一点点的问题，我都真诚希望您能告诉我！为了改善这个软件， 方便您的工作#
-
+#############################################################################
 trap "echo 'CheungSSH官方QQ群: 445342415'" EXIT
 cat  <<EOFshow
 CheungSSH环境安装如下:
@@ -34,7 +34,7 @@ pycrypto-on-pypi
 mod_python
 EOFshow
 read -p  '请知悉以上，然后按Enter继续...' T
-
+#############################################################################
 export LANG=zh_CN.UTF-8
 if [ `id -u` -ne 0 ]
 then
@@ -129,7 +129,7 @@ chown cheungssh.cheungssh -R /home/cheungssh
 }
 yum_install(){
 	echo  "使用Yum安装..."
-	yum install  -y gcc python-devel openssl-devel mysql-devel  swig httpd httpd-devel python-pip libevent-devel 
+	yum install  -y gcc python-devel openssl-devel mysql-devel  swig httpd httpd-devel python-pip libevent-devel  MySQL-python 
 	if  [ $? -ne 0 ]
 	then
 		echo "安装失败,重试中...."
@@ -232,7 +232,7 @@ EOFparamiko
 		###
 		
 
-		
+		##############安装redis
 	echo "正在安装redis服务器"
 	tar xvf /home/cheungssh/soft/redis-3.0.4.tar.gz -C /home/cheungssh/  &&
 	cd /home/cheungssh/redis-3.0.4  &&  make
@@ -241,7 +241,7 @@ EOFparamiko
 		echo "安装redis服务器失败了，请检查原因"
 		exit 1
 	fi
-		
+		##############安装redis
 
 	read -p  'CheungSSH需要数据库支持，远程或者本地都行，如果没有，程序将为您安装，如果有，您在以后需要填写数据库信息  yes表示有， no表示没有，有还是没有? (yes/no) ' emysql
 	emysql=${emysql:-y}
@@ -336,7 +336,7 @@ EOF
 	else
 		echo "初始化数据库完成"
 	fi
-	
+	########3
 	APXS=`which apxs`
 	APXS=${APXS:-/usr/sbin/apxs}
 	if [ ! -f $APXS ]
@@ -356,14 +356,14 @@ EOF
 		echo "安装mod_python失败，请检查原因"
 		exit 1
 	fi
-	
+	##########
 	/bin/cp /home/cheungssh/conf/version.py $(dirname `find   /usr/lib*/python*/site-packages/mod_python  -type f -name version.py`)
 	if  [ $? -ne 0 ]
 	then
 		echo "修改mod_python失败，请检查原因"
 		exit 1
 	fi
-	
+	##########
 	/bin/cp  /home/cheungssh/conf/httpd.conf /etc/httpd/conf/httpd.conf
 	if  [ $? -ne 0 ]
 	then
@@ -377,7 +377,7 @@ EOF
 		echo "修改配置失败,请检查原因"
 		exit 1
 	fi
-	
+	########3
 	chown -R  root.cheungssh /etc/httpd/ 2>/dev/null
 	chown -R cheungssh.cheungssh /home/cheungssh
 	if [ $? -ne 0 ]
@@ -394,7 +394,8 @@ EOF
 	fi
 	widgets=`echo  "from django.forms import widgets;print widgets.__file__.replace('pyc','py')"|python`
 	/bin/cp /home/cheungssh/bin/widgets.py $widgets
-	"echo 安装完成！"
+	/bin/rm -f ${widgets}c 
+	echo "安装完成！"
 	sh /home/cheungssh/bin/cheungssh-service.sh start
 	if  [ $? -ne 0 ]
 	then
@@ -413,9 +414,9 @@ EOF
 		启动CheungSSH服务: /home/cheungssh/bin/cheungssh-service.sh start"
 	###
 	exit 
-	
+	###############################################yum安装
 }
-
+#####################
 
 update(){
 	cp_file

bin/widgets.py

@@ -567,7 +567,7 @@ def render_option(self, selected_choices, option_value, option_label):
             cheungssh_permision_show    )  
         """return u'<option value="%s"%s>%s</option>' % (
             escape(option_value), selected_html,
-            conditional_escape(force_unicode(option_label)))  
+            conditional_escape(force_unicode(option_label)))"""  
 
     def render_options(self, choices, selected_choices):
         # Normalize to strings.

mysite/mysite/cheungssh/FileTransfer.py

@@ -186,7 +186,6 @@ def UploadFile(dfile,sfile,username,password,ip,port,su,supassword,sudo,sudopass
 	else:
 		t.close()
 def resove_conf(conf,fid,user,action):
-	print conf,99999999999999999999999999999999999999999999999999999999,"开始解析"
 	model="transfile_getfile_resove_conf"
 	info={"msgtype":"ERR","content":""}
 	try:
@@ -218,9 +217,7 @@ def resove_conf(conf,fid,user,action):
 			keyfile=conf["keyfile"]
 		except KeyError:
 			keyfile=""
-		print "解析wanle ",5555555555555555555555555,conf
 	except Exception,e:
-		print "报错",e,11111111111111111111111111111111111111111111
 		msg=str(e)
 		log(model,msg)
 		info["content"]=msg
@@ -233,12 +230,15 @@ def resove_conf(conf,fid,user,action):
 
 	b.start()
 def getconf(host,fid,user,action):
+
+
+
 	model="getconf"
 	try:
 		if not type({})==type(host):
 			host=eval(host)
 			if not type(host)==type({}):
-				log(model,"配置信息错误， 不是一个dict格式")
+				log(model,"GXXCXXF0000000001") 
 				return False
 	except Exception,e:
 		log(model,str(e))
@@ -249,13 +249,11 @@ def getconf(host,fid,user,action):
 			hostconf=cache.get('allconf')
 		except Exception,e:
 			log(model,str(e))
-			print e,66666666666,'错误'
 		hostconf=hostconf['content'][host['id']]
-		print hostconf,"这是提取的配置"
+
 	except Exception,e:
-		print "发生错误",e
+
 		log(model,str(e))
-		print e
 		return False
 	hostconf["sfile"]=host["sfile"]
 	if action=="download":

mysite/mysite/cheungssh/cheungssh.py

@@ -12,6 +12,7 @@
 import cheungssh_web,login_check
 import re,platform
 upload_dir="/home/cheungssh/upload"
+downloaddir='/home/cheungssh/download'
 keyfiledir="/home/cheungssh/keyfile"
 scriptfiledir="/home/cheungssh/scriptfile"
 reload(sys)
@@ -1070,7 +1071,7 @@ def getalluser(request):
 	response["Access-Control-Allow-Credentials"] = "true"
 	return response
 @login_check.login_check('重置登陆失败阈值')
-@permission_check('set_threshold')
+@permission_check('cheungssh.set_threshold')
 def set_threshold(request):
 	info={"msgtype":"ERR"}
 	threshold=request.GET.get('threshold')
@@ -1093,7 +1094,7 @@ def set_threshold(request):
 	return response
 
 @login_check.login_check('查看登录失败记录')
-@permission_check('show_ip_limit')
+@permission_check('cheungssh.show_ip_limit')
 def show_ip_limit(request):
 	info={"msgtype":"ERR","content":[]}
 	callback=request.GET.get('callback')
@@ -1128,7 +1129,7 @@ def show_ip_limit(request):
 	response["Access-Control-Allow-Credentials"] = "true"
 	return response
 @login_check.login_check('删除锁定IP')
-@permission_check('del_ip_limit')
+@permission_check('cheungssh.del_ip_limit')
 def del_ip_limit(request):
 	callback=request.GET.get('callback')
 	ip=request.GET.get('ip')
@@ -1147,7 +1148,7 @@ def del_ip_limit(request):
 	response["Access-Control-Allow-Credentials"] = "true"
 	return response
 @login_check.login_check('查看登陆失败次数阈值')
-@permission_check('show_threshold')
+@permission_check('cheungssh.show_threshold')
 def show_ip_threshold(request):
 	callback=request.GET.get('callback')
 	info={"msgtype":"ERR"}
@@ -1166,3 +1167,45 @@ def show_ip_threshold(request):
 	response["Access-Control-Allow-Methods"] = "POST"
 	response["Access-Control-Allow-Credentials"] = "true"
 	return response
+@login_check.login_check('查看远程文件内容')
+@permission_check('cheungssh.get_remote_filecontent')
+def get_file_content(request):
+	info={"msgtype":"ERR"}
+	filename=request.GET.get('filename') 
+	callback=request.GET.get('callback')
+	filepath=os.path.join(downloaddir,filename)
+	try:
+		with open(filepath) as f:
+			info["content"]="".join(f.readlines())
+		info['msgtype']='OK'
+	except Exception,e:
+		info["content"]=str(e)
+	info=json.dumps(info,encoding="utf-8",ensure_ascii=False)
+	if callback is None:
+		info=info
+	else:
+		info="%s(%s)"  % (callback,info)
+	response=HttpResponse(info)
+	response["Access-Control-Allow-Origin"] = "*"
+	response["Access-Control-Allow-Methods"] = "POST"
+	response["Access-Control-Allow-Credentials"] = "true"
+	return response
+@login_check.login_check('更新远程文件内容')
+@permission_check('cheungssh.up_remote_filecontent')
+def up_file_content(request):
+	info={"msgtype":"ERR"}
+	content=request.POST.get('content')
+	filename=request.POST.get('filename')  
+	filepath=os.path.join(upload_dir,filename)
+	try:
+		with open(filepath,'w')as f: 
+			f.write(content)
+		info["msgtype"]="OK"
+	except Exception,e:
+		info["content"]=str(e)
+	info=json.dumps(info,encoding="utf-8",ensure_ascii=False)
+	response=HttpResponse(info)
+	response["Access-Control-Allow-Origin"] = "*"
+	response["Access-Control-Allow-Methods"] = "POST"
+	response["Access-Control-Allow-Credentials"] = "true"
+	return response

mysite/mysite/cheungssh/models.py

@@ -55,6 +55,8 @@ class Meta:
 				("del_ip_limit","删除锁定的IP记录"),
 				("show_threshold",'查看登陆失败次数阈值'),
 				("set_threshold","设置登录失败次数阈值"),
+				("get_remote_filecontent","查看远程服务器的文件内容"),
+				("up_remote_filecontent","更新远程文件内容"),
 
 			)
 	def __unicode__(self):

mysite/mysite/cheungssh/urls.py

@@ -51,4 +51,6 @@
 	url(r"^cheungssh/showiplimit/$","mysite.cheungssh.cheungssh.show_ip_limit"),
 	url(r"^cheungssh/showipthreshold/$","mysite.cheungssh.cheungssh.show_ip_threshold"),
 	url(r"^cheungssh/deliplimit/$","mysite.cheungssh.cheungssh.del_ip_limit"),
+	url(r"^cheungssh/catfile/$","mysite.cheungssh.cheungssh.get_file_content"),
+	url(r'^cheungssh/updatefile/$',"mysite.cheungssh.cheungssh.up_file_content"),
 	)