diff --git a/library/think/Validate.php b/library/think/Validate.php
index a789fe2f..c5dfb830 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -13,6 +13,7 @@ namespace think;
 
 class Validate
 {
+    // 预定义正则验证规则
     protected static $rule = [
         'require'  => '/\S+/',
         'email'    => '/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/',
@@ -24,8 +25,26 @@ class Validate
         'double'   => '/^[-\+]?\d+(\.\d+)?$/',
         'english'  => '/^[A-Za-z]+$/',
     ];
+
+    // 验证失败错误信息
     protected static $error = [];
 
+    /**
+     * 设置正则验证规则
+     * @access protected
+     * @param string|array $name  规则名称或者规则数组
+     * @param string $rule  正则规则
+     * @return void
+     */
+    public static function rule($name, $rule = '')
+    {
+        if (is_array($name)) {
+            self::$rule = array_merge(self::$rule, $name);
+        } else {
+            self::$rule[$name] = $rule;
+        }
+    }
+
     /**
      * 数据自动验证
      * @access protected
diff --git a/tests/thinkphp/library/think/validateTest.php b/tests/thinkphp/library/think/validateTest.php
new file mode 100644
index 00000000..9b20aff4
--- /dev/null
+++ b/tests/thinkphp/library/think/validateTest.php
@@ -0,0 +1,141 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+/**
+ * 模型类测试
+ */
+
+namespace tests\thinkphp\library\think;
+
+use think\Config;
+use think\Validate;
+
+class validateTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testCheck()
+    {
+        $data = [
+            'username'   => 'username',
+            'nickname'   => 'nickname',
+            'password'   => '123456',
+            'repassword' => '123456',
+            'mobile'     => '13800000000',
+            'email'      => 'abc@abc.com',
+            'sex'        => '0',
+            'age'        => '20',
+            'code'       => '1234',
+        ];
+
+        $validate = [
+            '__pattern__' => [
+                'mobile'  => '/^1(?:[358]\d|7[6-8])\d{8}$/',
+                'require' => '/.+/',
+            ],
+            '__all__'     => [
+                'code' => function ($value, $data) {
+                    return '1234' != $value ? 'code error' : true;
+                },
+            ],
+            'user'        => [
+                ['username', [ & $this, 'checkName'], '用户名长度为5到15个字符', 'callback', 'username'],
+                ['nickname', 'require', '请填昵称'],
+                'password'   => ['[\w-]{6,15}', '密码长度为6到15个字符'],
+                'repassword' => ['password', '两次密码不一到致', 'confirm'],
+                'mobile'     => ['mobile', '手机号错误'],
+                'email'      => ['validate_email', '邮箱格式错误', 'filter'],
+                'sex'        => ['0,1', '性别只能为为男或女', 'in'],
+                'age'        => ['1,80', '年龄只能在10-80之间', 'between'],
+                '__option__' => [
+                    'scene'           => [
+                        'add'  => 'username,nickname,password,repassword,mobile,email,age,code',
+                        'edit' => 'nickname,password,repassword,mobile,email,sex,age,code',
+                    ],
+                    'value_validate'  => 'email',
+                    'exists_validate' => 'password,repassword,code',
+                ],
+            ],
+        ];
+        Config::set('validate', $validate);
+        Validate::check($data, 'user.add');
+        $this->assertEquals([], Validate::getError());
+
+        unset($data['password'], $data['repassword']);
+        $data['email'] = '';
+        Validate::check($data, 'user.edit');
+        $this->assertEquals([], Validate::getError());
+
+    }
+
+    public function checkName($value, $field)
+    {
+        switch ($field) {
+            case 'username':
+                return !empty($value);
+            case 'mobile':
+                return 13 == strlen($value);
+        }
+    }
+
+    public function testFill()
+    {
+        $data = [
+            'username' => '',
+            'nickname' => 'nickname',
+            'phone'    => ' 123456',
+            'hobby'    => ['1', '2'],
+            'cityid'   => '1',
+            'a'        => 'a',
+            'b'        => 'b',
+        ];
+        $auto = [
+            'user' => [
+                '__option__' => [
+                    'value_fill'  => ['username', 'password', 'phone'],
+                    'exists_fill' => 'nickname',
+                ],
+                'username'   => ['strtolower', 'callback'],
+                'password'   => ['md5', 'callback'],
+                'nickname'   => [[ & $this, 'fillName'], 'callback', 'cn_'],
+                'phone'      => function ($value, $data) {
+                    echo $value;
+                    return trim($value);
+                },
+                'ab'         => ['a,b', 'serialize'],
+                'cityid'     => ['1', 'ignore'],
+                'address'    => ['address'],
+                'integral'   => 0,
+                ['reg_time', 'time', 'callback'],
+                ['login_time', function ($value, $data) {
+                    return $data['reg_time'];
+                }],
+            ],
+        ];
+        Config::set('auto', $auto);
+        $result             = Validate::fill($data, 'user');
+        $data['nickname']   = 'cn_nickname';
+        $data['phone']      = '123456';
+        $data['ab']         = serialize(['a' => 'a', 'b' => 'b']);
+        $data['address']    = 'address';
+        $data['integral']   = 0;
+        $data['reg_time']   = time();
+        $data['login_time'] = $data['reg_time'];
+        unset($data['cityid'], $data['a'], $data['b']);
+        $this->assertEquals($data, $result);
+
+    }
+
+    public function fillName($value, $prefix)
+    {
+        return $prefix . trim($value);
+    }
+
+}