Merge pull request #14 from daivem/feature/dv

Feature/dv

Author: daivem

README.md

@@ -38,6 +38,14 @@ application/config/config_auth.php # 登录及验证码配置
 -----------------------------------------------
 更新日志：
 
+v0.3.6 (2015-12-11)
+
+增加对redis自带的auth身份验证的支持（详见application/config/config_redis.php）
+
+修改string类型的key的value时，可选择保持其原有生存期(ttl)不变
+
+——————————————————
+
 v0.3.5 (2015-11-07)
 
 修正了部分JS的错误

application/config/config_redis.php

@@ -5,6 +5,7 @@
 		'name' => 'localhost server', 
 		'host' => '127.0.0.1',
 		'port' => 6379,
+		'auth' => FALSE, //如无密码，可不设置此键，或将值设置为FALSE or NULL
 	),
 	/*
 	 * 集群服务器
@@ -21,5 +22,5 @@
 			'127.0.0.1:7012',
 		),
 	),
-	*/	
+	*/
 );

application/controllers/edit.php

@@ -97,10 +97,18 @@ private function _do_index()
 
 		if ( $type == 'string' ) {
 			//string
+			$keep_ttl = get_post_arg('keep_ttl', 0, 'intval');
+			$orig_ttl = 0;
+			if ( $keep_ttl ) {
+				$orig_ttl = (int)$redis -> ttl($key);
+			}
 			$result = $redis -> set($key, $value);
 			if ( ! $result ) {
 				show_error('操作失败');
 			}
+			if ($orig_ttl > 0) {
+				$redis -> expire($key, $orig_ttl);
+			}
 		} elseif ( $type == 'hash' ) {
 			//hash
 			$hkey = get_post_arg('hkey');
@@ -116,7 +124,7 @@ private function _do_index()
 					&& ( ! $redis -> hExists($key, $hkey) )
 				){
 					//如果新的hkey不存在的话
-					//删掉用来的旧KEY
+					//删掉原来的旧KEY
 					$redis -> hDel($key, $old_hkey);
 				}
 

application/models/redis_model.php

@@ -7,6 +7,7 @@ class Redis_Model extends CI_Model {
 	private $_host;
 	private $_port;
 	private $_db;
+	private $_auth;
 
 	public function __construct()
 	{
@@ -50,6 +51,10 @@ private function _init_cluster($redis_config)
 		} catch (Exception $e) {
 			show_error('Can not connect to Redis Cluster. Message:' . $e -> getMessage());
 		}
+		
+		if ( ! $this -> auth() ) {
+			show_error('Redis Server (' . $this -> _host . ':' . $this -> _port . ') 认证密码错误!');
+		}
 	}
 
 
@@ -60,6 +65,7 @@ private function _init_redis($redis_config)
 		$this -> _host = $redis_config['host'];
 		$this -> _port = isset($redis_config['port']) ? $redis_config['port'] : 6379;
 		$this -> _db = isset($redis_config['db']) ? $redis_config['db'] : 0;
+		$this -> _auth = isset($redis_config['auth']) ? $redis_config['auth'] : FALSE;
 
 
 		$this -> _redis = new Redis();
@@ -101,9 +107,25 @@ public function select_db($db)
 	{
 		$db = (int)$db;
 		$this -> _db = $db;
-		$this -> _redis -> select($this -> _db);
+		try {
+			$this -> _redis -> select($this -> _db);
+		} catch (Exception $e) {
+			show_error('连接服务器时发生错误：' . $e -> getMessage());
+		}
 	}
 
+	/**
+	 * 设置认证密码
+	 */
+	public function auth()
+	{
+		if ( ( FALSE !== $this -> _auth )
+			&& ( NULL !== $this -> _auth )
+		){
+			return $this -> _redis -> auth($this -> _auth);
+		}
+		return TRUE;
+	}
 
 	/**
 	 * 

application/views/edit.php

@@ -35,7 +35,15 @@
 		<textarea name="value" id="value" cols="80" rows="20"><?= nl2br(format_html($value))?></textarea>
 	</p>
 	<input type="hidden" name="oldvalue" value="<?= format_html($value)?>">
+    <?php 
+            if ( ($type == 'string') && ($is_edit) ) {
+    ?>
+    <p><input type="checkbox" name="keep_ttl" value="1" checked>保持生存期(ttl)不变</p>
+    <?php
+        }
+    ?>
 	<p>
+
 		<input type="submit" class="button" value="<?= $is_edit ? '编辑' : '新增'?>">
 	</p>
 </form>