diff --git a/module/productplan/control.php b/module/productplan/control.php
index ab589b4eae..5d3636e406 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -758,7 +758,14 @@ class productplan extends control
             $this->productplan->unlinkStory($storyID, $planID);
             $this->loadModel('action')->create('productplan', $planID, 'unlinkstory', '', $storyID);
 
-            return print(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=story"), 'parent'));
+            if($this->session->storyList)
+            {
+                return print(js::locate($this->session->storyList, 'parent'));
+            }
+            else
+            {
+                return print(js::locate($this->createLink('productplan', 'view', "planID=$planID&type=story"), 'parent'));
+            }
         }
     }
 
diff --git a/module/project/css/create.css b/module/project/css/create.css
index 9d2c6d922c..5dba519dbd 100755
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -16,7 +16,7 @@
 #budgetUnit {border-left: 0px;}
 #projectName {display: inline-block; width: 32%;}
 .productsBox a {border-radius: 2px !important;}
-.productsBox .required:after {right: -9.5px !important;}
+.productsBox .required:after {right: -12px !important; top: 10px !important;}
 .productsBox .addProduct {padding-left: 0px !important;}
 .productsBox .addProduct.required:after {right: -1px !important;}
 .productsBox .input-group-addon > div {display: inline-block !important;}
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 734db0e769..3c73d6050d 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -584,7 +584,7 @@ class upgradeModel extends model
                     $this->execSQL($xuanxuanSql);
                 }
                 break;
-            case '18_0_beta2':
+            case '18_0_beta3':
                 $this->updateMyBlocks();
                 break;
         }
diff --git a/module/user/model.php b/module/user/model.php
index c8b983f546..375febbe1b 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1957,7 +1957,11 @@ class userModel extends model
         /* Get product and project relation. */
         $projectProducts = array();
         $productProjects = array();
-        $stmt = $this->dao->select('project,product')->from(TABLE_PROJECTPRODUCT)->where('product')->in(array_keys($allProducts))->query();
+        $stmt = $this->dao->select('t1.project, t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->where('t1.product')->in(array_keys($allProducts))
+            ->andWhere('t2.deleted')->eq('0')
+            ->query();
         while($projectProduct = $stmt->fetch())
         {
             $productProjects[$projectProduct->product][$projectProduct->project] = $projectProduct->project;
diff --git a/test/class/user.class.php b/test/class/user.class.php
index 7f78827947..b45bd6fbac 100755
--- a/test/class/user.class.php
+++ b/test/class/user.class.php
@@ -237,7 +237,7 @@ class userTest
     public function createUserTest($params = array())
     {
         $_POST  = $params;
-        $_POST['verifyPassword'] = 'e79f8fb9726857b212401e42e5b7e18b';
+        $_POST['verifyPassword'] = 'bac0bbaaf7192f219bebd5387e88c5d7';
 
         $userID = $this->objectModel->create();
         unset($_POST);
@@ -261,7 +261,11 @@ class userTest
     public function batchCreateUserTest($params = array())
     {
         $_POST  = $params;
-        $_POST['verifyPassword'] = 'e79f8fb9726857b212401e42e5b7e18b';
+        $_POST['verifyPassword'] = 'bac0bbaaf7192f219bebd5387e88c5d7';
+        $_POST['userType']       = 'inside';
+
+        global $tester;
+        $tester->config->user->batchCreate = count($_POST['account']);
 
         $userIDList = $this->objectModel->batchCreate();
         unset($_POST);
@@ -290,7 +294,7 @@ class userTest
     public function updateUserTest($userID, $params = array())
     {
         $_POST = $params;
-        $_POST['verifyPassword'] = 'e79f8fb9726857b212401e42e5b7e18b';
+        $_POST['verifyPassword'] = 'bac0bbaaf7192f219bebd5387e88c5d7';
 
         $this->objectModel->update($userID);
         unset($_POST);
@@ -315,9 +319,9 @@ class userTest
     public function batchEditUserTest($params = array())
     {
         $_POST = $params;
-        $_POST['verifyPassword'] = 'e79f8fb9726857b212401e42e5b7e18b';
+        $_POST['verifyPassword'] = 'bac0bbaaf7192f219bebd5387e88c5d7';
 
-        $this->objectModel->batchEdit($params);
+        $this->objectModel->batchEdit();
         unset($_POST);
 
         if(dao::isError())
@@ -971,4 +975,19 @@ class userTest
         $string = $this->objectModel->setUserList($users, $account);
         return strpos($string, "<option value='$account' selected='selected'") !== false ? 1 : 0;
     }
+
+    /**
+     * Update session random.
+     *
+     * @access public
+     * @return int
+     */
+    public function updateSessionRandomTest()
+    {
+        global $tester;
+        $oldRandom = $tester->session->rand;
+        $newRandom = $this->objectModel->updateSessionRandom();
+
+        return $oldRandom != $newRandom ? 1 : 0;
+    }
 }
diff --git a/test/model/user/batchcreate.php b/test/model/user/batchcreate.php
index 786a5ddf51..7af54b4b47 100755
--- a/test/model/user/batchcreate.php
+++ b/test/model/user/batchcreate.php
@@ -2,9 +2,10 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
 su('admin');
 
+zdTable('user')->gen(1);
+
 /**
 
 title=测试 userModel->batchCreate();
@@ -23,9 +24,26 @@ $normalUser['realname'] = array(1 => '新测试用户1', 2 => '新测试用户2'
 $normalUser['visions']  = array(1 => array('rnd'), 2 => array('rnd','lite'), 3 => array('lite'));
 $normalUser['role']     = array(1 => 'qa', 2 => 'dev', 3 => 'pm');
 $normalUser['email']    = array(1 => 'testasd@163.com', 2 => '', 3 => '11773@qq.com');
-$normalUser['password'] = array(1 => 'e10adc3949ba59abbe56e057f20f883e', 2 => 'e10adc3949ba59abbe56e057f20f883e', 3 => 'e10adc3949ba59abbe56e057f20f883e');
+$normalUser['password'] = array(1 => 'Zentao123@', 2 => 'Zentao123@', 3 => 'Zentao123@');
+$normalUser['dept']     = array(1 => '', 2 => '', 3 => '');
+$normalUser['join']     = array(1 => '2023-01-01', 2 => '2023-01-01', 3 => '2023-01-01');
+$normalUser['type']     = array(1 => 'inside', 2 => 'inside', 3 => 'inside');
+$normalUser['group']    = array(1 => array(), 2 => array(), 3 => array());
+$normalUser['gender']   = array(1 => 'm', 2 => 'm', 3 => 'm');
+$normalUser['compnay']  = array(1 => '', 2 => '', 3 => '');
+$normalUser['commiter'] = array(1 => '', 2 => '', 3 => '');
+$normalUser['skype']    = array(1 => '', 2 => '', 3 => '');
+$normalUser['qq']       = array(1 => '', 2 => '', 3 => '');
+$normalUser['dingding'] = array(1 => '', 2 => '', 3 => '');
+$normalUser['weixin']   = array(1 => '', 2 => '', 3 => '');
+$normalUser['mobile']   = array(1 => '', 2 => '', 3 => '');
+$normalUser['slack']    = array(1 => '', 2 => '', 3 => '');
+$normalUser['whatsapp'] = array(1 => '', 2 => '', 3 => '');
+$normalUser['phone']    = array(1 => '', 2 => '', 3 => '');
+$normalUser['address']  = array(1 => '', 2 => '', 3 => '');
+$normalUser['zipcode']  = array(1 => '', 2 => '', 3 => '');
+$normalUser['ditto']    = array(1 => '', 2 => '', 3 => '');
 
 r($user->batchCreateUserTest($normalUser)) && p('0:account')  && e('newtestuser1'); //获取插入的第一个用户的account
+zdTable('user')->gen(1);
 r($user->batchCreateUserTest($normalUser)) && p('2:realname') && e('新测试用户3');  //获取插入的最后一个用户的realname
-
-$db->restoreDB();
\ No newline at end of file
diff --git a/test/model/user/batchedit.php b/test/model/user/batchedit.php
index af4d939067..1b197e166e 100755
--- a/test/model/user/batchedit.php
+++ b/test/model/user/batchedit.php
@@ -2,9 +2,10 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
 su('admin');
 
+zdTable('user')->gen(15);
+
 /**
 
 title=测试 userModel->batchEdit();
@@ -18,14 +19,26 @@ pid=1
 
 $user = new userTest();
 $normalUser = array();
-$normalUser['account']  = array(998 => 'newtestuser1', 999 => 'newtestuser2', 1000 => 'newtestuser3');
-$normalUser['realname'] = array(998 => '新测试用户1', 999 => '新测试用户2', 1000 => '新测试用户3');
-$normalUser['visions']  = array(998 => 'rnd', 999 => 'rnd,lite', 1000 => 'lite');
-$normalUser['role']     = array(998 => 'qa', 999 => 'dev', 1000 => 'pm');
-$normalUser['email']    = array(998 => 'testasd@163.com', 999 => '', 1000 => '11773@qq.com');
-$normalUser['password'] = array(998 => 'e10adc3949ba59abbe56e057f20f883e', 999 => 'e10adc3949ba59abbe56e057f20f883e', 1000 => 'e10adc3949ba59abbe56e057f20f883e');
+$normalUser['account']  = array(8 => 'newtestuser1', 9 => 'newtestuser2', 10 => 'newtestuser3');
+$normalUser['realname'] = array(8 => '新测试用户1', 9 => '新测试用户2', 10 => '新测试用户3');
+$normalUser['commiter'] = array(8 => 'user1', 9 => 'user2', 10 => 'user3');
+$normalUser['email']    = array(8 => 'testasd@163.com', 9 => '', 10 => '11773@qq.com');
+$normalUser['type']     = array(8 => 'inside', 9 => 'inside', 10 => 'outside');
+$normalUser['join']     = array(8 => '0000-00-00', 9 => '0000-00-00', 10 => '0000-00-00');
+$normalUser['skype']    = array(8 => '', 9 => '', 10 => '');
+$normalUser['qq']       = array(8 => '', 9 => '', 10 => '');
+$normalUser['dingding'] = array(8 => '', 9 => '', 10 => '');
+$normalUser['weixin']   = array(8 => '', 9 => '', 10 => '');
+$normalUser['mobile']   = array(8 => '', 9 => '', 10 => '');
+$normalUser['slack']    = array(8 => '', 9 => '', 10 => '');
+$normalUser['whatsapp'] = array(8 => '', 9 => '', 10 => '');
+$normalUser['phone']    = array(8 => '', 9 => '', 10 => '');
+$normalUser['address']  = array(8 => '', 9 => '', 10 => '');
+$normalUser['zipcode']  = array(8 => '', 9 => '', 10 => '');
+$normalUser['visions']  = array(8 => array('rnd'), 9 => array('rnd', 'lite'), 10 => array('lite'));
+$normalUser['dept']     = array(8 => '1', 9 => '1', 10 => '1');
+$normalUser['role']     = array(8 => 'qa', 9 => 'dev', 10 => 'pm');
+$normalUser['password'] = array(8 => 'e10adc3949ba59abbe56e057f20f883e', 9 => 'e10adc3949ba59abbe56e057f20f883e', 10 => 'e10adc3949ba59abbe56e057f20f883e');
 
-r($user->batchEditUserTest($normalUser)) && p('998:account')   && e('newtestuser1'); //获取编辑后的第一个用户的account
-r($user->batchEditUserTest($normalUser)) && p('1000:realname') && e('新测试用户3');  //获取编辑的最后一个用户的真实姓名
-
-$db->restoreDB();
\ No newline at end of file
+r($user->batchEditUserTest($normalUser)) && p('8:account')   && e('newtestuser1'); //获取编辑后的第一个用户的account
+r($user->batchEditUserTest($normalUser)) && p('10:realname') && e('新测试用户3');  //获取编辑的最后一个用户的真实姓名
diff --git a/test/model/user/checkpassword.php b/test/model/user/checkpassword.php
index e56830730e..38872f3200 100755
--- a/test/model/user/checkpassword.php
+++ b/test/model/user/checkpassword.php
@@ -2,9 +2,10 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
 su('admin');
 
+zdTable('user')->gen(10);
+
 /**
 
 title=测试 userModel->checkPassword();
@@ -12,8 +13,8 @@ cid=1
 pid=1
 
 正常的用户密码 >> 无报错
-两次密码不相同的情况 >> 两次密码应该相同。
-密码强度小于系统设定 >> 您的密码强度小于系统设定。
+两次密码不相同的情况 >> 两次密码应该相同。<br/>
+密码强度小于系统设定 >> 密码必须6位及以上，且包含大小写字母、数字。<br/>
 使用常见简单密码，给出错误提示 >> 密码不能使用【123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123】这些常用弱口令。
 
 */
@@ -31,11 +32,10 @@ $differentPassword = $normalUser;
 $differentPassword['password2'] = '!@#!@#asfasf';
 
 $simplePassword = $normalUser;
-$simplePassword['password1'] = '123456';
-$simplePassword['password2'] = '123456';
+$simplePassword['password1'] = 'e10adc3949ba59abbe56e057f20f883e';
+$simplePassword['password2'] = 'e10adc3949ba59abbe56e057f20f883e';
 
 r($user->checkPasswordTest($normalUser))         && p('password')    && e('无报错');                     //正常的用户密码
-r($user->checkPasswordTest($differentPassword))  && p('password:0')  && e('两次密码应该相同。');         //两次密码不相同的情况
-r($user->checkPasswordTest($weakPassword))       && p('password1:0') && e('您的密码强度小于系统设定。'); //密码强度小于系统设定
-r($user->checkPasswordTest($simplePassword))     && p('password1:0') && e('密码不能使用【123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123】这些常用弱口令。'); //使用常见简单密码，给出错误提示
-$db->restoreDB();
\ No newline at end of file
+r($user->checkPasswordTest($differentPassword))  && p('password1:0') && e('两次密码应该相同。<br/>');         //两次密码不相同的情况
+r($user->checkPasswordTest($weakPassword))       && p('password1:0') && e('密码必须6位及以上，且包含大小写字母、数字。<br/>'); //密码强度小于系统设定
+r($user->checkPasswordTest($simplePassword))     && p('password1')   && e('密码不能使用【123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123】这些常用弱口令。'); //使用常见简单密码，给出错误提示
diff --git a/test/model/user/create.php b/test/model/user/create.php
index 9868565944..669058b6fd 100755
--- a/test/model/user/create.php
+++ b/test/model/user/create.php
@@ -2,22 +2,22 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
 su('admin');
 
+zdTable('user')->gen(10);
+
 /**
 
 title=测试 userModel->createUser();
 cid=1
 pid=1
 
-密码较弱的情况 >> 您的密码强度小于系统设定。
-Visions为空的情况 >> 『版本类型』不能为空。
+密码较弱的情况 >>  密码必须6位及以上，且包含大小写字母、数字。<br/>
+Visions为空的情况 >> 『界面类型』不能为空。
 用户名为空的情况 >> 『用户名』不能为空。
 用户名特殊的情况 >> 『用户名』只能是字母、数字或下划线的组合三位以上。
-两次密码不相同的情况 >> 两次密码应该相同。
+两次密码不相同的情况 >> 两次密码应该相同。<br/>
 插入重复的用户名，返回报错信息 >> 『用户名』已经有『admin』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
-正常插入用户，返回新插入的ID、真实姓名 >> 1001,新的测试用户
 正常插入用户，返回新插入的真实姓名 >> 新的测试用户
 
 */
@@ -26,8 +26,8 @@ $user = new userTest();
 $normalUser = array();
 $normalUser['account']          = 'newtestuser';
 $normalUser['realname']         = '新的测试用户';
-$normalUser['password1']        = 'e10adc3949ba59abbe56e057f20f883e';
-$normalUser['password2']        = 'e10adc3949ba59abbe56e057f20f883e';
+$normalUser['password1']        = '6da8a7c05e2aa1774828500a8370feea';
+$normalUser['password2']        = '6da8a7c05e2aa1774828500a8370feea';
 $normalUser['type']             = 'inside';
 $normalUser['passwordStrength'] = 1;
 $normalUser['visions']          = 'rnd';
@@ -39,7 +39,7 @@ $emptyVisions = $normalUser;
 unset($emptyVisions['visions']);
 
 $emptyAccount = $normalUser;
-unset($emptyAccount['account']);
+$emptyAccount['account'] = '';
 
 $specialAccount = $normalUser;
 $specialAccount['account'] = 'sa!@#asdf';
@@ -50,12 +50,10 @@ $differentPassword['password2'] = 'asfjhjkahf9012asd123';
 $existUser = $normalUser;
 $existUser['account'] = 'admin';
 
-r($user->createUserTest($weakPassword))      && p('password1:0') && e('您的密码强度小于系统设定。');                                                                   //密码较弱的情况
-r($user->createUserTest($emptyVisions))      && p('visions:0')   && e('『版本类型』不能为空。');                                                                       //Visions为空的情况
+r($user->createUserTest($weakPassword))      && p('password1:0') && e(' 密码必须6位及以上，且包含大小写字母、数字。<br/>');                                            //密码较弱的情况
+r($user->createUserTest($emptyVisions))      && p('visions:0')   && e('『界面类型』不能为空。');                                                                       //Visions为空的情况
 r($user->createUserTest($emptyAccount))      && p('account:0')   && e('『用户名』不能为空。');                                                                         //用户名为空的情况
 r($user->createUserTest($specialAccount))    && p('account:0')   && e('『用户名』只能是字母、数字或下划线的组合三位以上。');                                           //用户名特殊的情况
-r($user->createUserTest($differentPassword)) && p('password:0')  && e('两次密码应该相同。');                                                                           //两次密码不相同的情况
+r($user->createUserTest($differentPassword)) && p('password1:0') && e('两次密码应该相同。<br/>');                                                                      //两次密码不相同的情况
 r($user->createUserTest($existUser))         && p('account:0')   && e('『用户名』已经有『admin』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。'); //插入重复的用户名，返回报错信息
-r($user->createUserTest($normalUser))        && p('id,realname') && e('1001,新的测试用户');                                                                            //正常插入用户，返回新插入的ID、真实姓名
 r($user->createUserTest($normalUser))        && p('realname')    && e('新的测试用户');                                                                                 //正常插入用户，返回新插入的真实姓名
-$db->restoreDB();
\ No newline at end of file
diff --git a/test/model/user/getbyid.php b/test/model/user/getbyid.php
index 533b877ebe..5dc623fdc2 100755
--- a/test/model/user/getbyid.php
+++ b/test/model/user/getbyid.php
@@ -4,6 +4,8 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+zdTable('user')->gen(10);
+
 /**
 
 title=测试 userModel::getById();
@@ -20,6 +22,6 @@ $user = new userTest();
 r($user->getByIDTest(1, 'id'))               && p('account') && e('admin'); // 通过id获取存在的用户
 r($user->getByIDTest('admin', 'account'))    && p('account') && e('admin'); // 使用account字段获取存在的用户
 r($user->getByIDTest('admin'))               && p('account') && e('admin'); // 通过默认字段获取存在的用户
-r($user->getByIDTest(1))                     && p('account') && e('');      // 通过默认字段获取不存在的用户
-r($user->getByIDTest(100000, 'id'))          && p('account') && e('');      // 通过id字段获取不存在的用户
-r($user->getByIDTest('error', 'account'))    && p('account') && e('');      // 通过默认字段获取不存在的用户
\ No newline at end of file
+r($user->getByIDTest(1))                     && p('account') && e('0');     // 通过默认字段获取不存在的用户
+r($user->getByIDTest(100000, 'id'))          && p('account') && e('0');     // 通过id字段获取不存在的用户
+r($user->getByIDTest('error', 'account'))    && p('account') && e('0');     // 通过默认字段获取不存在的用户
diff --git a/test/model/user/getbyquery.php b/test/model/user/getbyquery.php
index c3cd097b94..56ca5c0139 100755
--- a/test/model/user/getbyquery.php
+++ b/test/model/user/getbyquery.php
@@ -4,6 +4,8 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+zdTable('user')->gen(1000);
+
 /**
 
 title=测试 userModel::getById();
@@ -21,4 +23,4 @@ $outsideUsers  = $user->getByQueryTest('outside');
 
 r(count($insideQAUsers)) && p()              && e('303');    //对比获取到的内部用户的数量
 r($insideQAUsers)        && p('302:account') && e('admin');  //按ID倒序查询内部用户，获取最后一个用户的account
-r($outsideUsers)         && p('0:realname')  && e('用户1');  //获取第一个外部用户的真实姓名
\ No newline at end of file
+r($outsideUsers)         && p('0:realname')  && e('用户1');  //获取第一个外部用户的真实姓名
diff --git a/test/model/user/getcommiters.php b/test/model/user/getcommiters.php
index 5b2d87f9fb..05fa945f13 100755
--- a/test/model/user/getcommiters.php
+++ b/test/model/user/getcommiters.php
@@ -4,13 +4,7 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
-$user = zdTable('user');
-$user->id->range('1001-1005');
-$user->account->range('1-5')->prefix("account");
-$user->realname->range('1-5')->prefix("用户名");
-$user->type->range('inside{3},outside{2}');
-$user->deleted->range('0-1');
-$user->gen(5);
+zdTable('user')->gen(30);
 
 /**
 
@@ -18,13 +12,13 @@ title=测试 userModel->getCommiters();
 cid=1
 pid=1
 
-获取源代码账号为qd100的用户真实姓名 >> 高层管理100
-获取系统中源代码账号不为空的用户数量 >> 1000
+获取源代码账号为user10的用户真实姓名 >> 测试10
+获取系统中源代码账号不为空的用户数量 >> 30
 
 */
 
 $user = new userTest();
 $commiters = $user->getCommitersTest();
 
-r($commiters)        && p('qd100') && e('高层管理100'); //获取源代码账号为qd100的用户真实姓名
-r(count($commiters)) && p()        && e('1000');        //获取系统中源代码账号不为空的用户数量
+r($commiters)        && p('user10') && e('测试10'); //获取源代码账号为user10的用户真实姓名
+r(count($commiters)) && p()         && e('30');     //获取系统中源代码账号不为空的用户数量
diff --git a/test/model/user/getuserdisplayinfos.php b/test/model/user/getuserdisplayinfos.php
index 60e6f5e86f..7853070900 100755
--- a/test/model/user/getuserdisplayinfos.php
+++ b/test/model/user/getuserdisplayinfos.php
@@ -4,13 +4,15 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+zdTable('user')->gen(1000);
+
 /**
 
-title=测试 userModel->getPairs();
+title=测试 userModel->getuserdisplayinfos();
 cid=1
 pid=1
 
-查找获取到的用户名为dev33的真实姓名 >> 项目经理33
+查找获取到的用户名为dev33的真实姓名 >> 开发33
 查找获取到的用户名为user10的头像 >> /home/z/tmp/10.png
 查找获取到的用户名为outside1的外部用户的头像信息 >> /home/z/tmp/18.png
 查找获取到的用户名为cccfff的真实姓名 >> Error: Cannot get index cccfff.
@@ -20,7 +22,7 @@ pid=1
 $accounts = array('!asd12d', '中文用户名', 'user10', 'dev33', 'cccfff', 'outside1');
 $user  = new userTest();
 
-r($user->getUserDisplayInfosTest($accounts))               && p('dev33:realname')   && e('项目经理33');                      //查找获取到的用户名为dev33的真实姓名
+r($user->getUserDisplayInfosTest($accounts))               && p('dev33:realname')   && e('开发33');                          //查找获取到的用户名为dev33的真实姓名
 r($user->getUserDisplayInfosTest($accounts))               && p('user10:avatar')    && e('/home/z/tmp/10.png');              //查找获取到的用户名为user10的头像
 r($user->getUserDisplayInfosTest($accounts, 0, 'outside')) && p('outside1:avatar')  && e('/home/z/tmp/18.png');              //查找获取到的用户名为outside1的外部用户的头像信息
-r($user->getUserDisplayInfosTest($accounts))               && p('cccfff:realname')  && e('Error: Cannot get index cccfff.'); //查找获取到的用户名为cccfff的真实姓名
\ No newline at end of file
+r($user->getUserDisplayInfosTest($accounts))               && p('cccfff:realname')  && e('Error: Cannot get index cccfff.'); //查找获取到的用户名为cccfff的真实姓名
diff --git a/test/model/user/getuserroles.php b/test/model/user/getuserroles.php
index e10c77d1d6..d75e46dcf0 100755
--- a/test/model/user/getuserroles.php
+++ b/test/model/user/getuserroles.php
@@ -4,21 +4,25 @@ include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
 su('admin');
 
+zdTable('user')->gen(30);
+
 /**
 
 title=测试 userModel->getPairs();
 cid=1
 pid=1
 
-获取用户名和职位Key的键值对 >> dev
-获取用户名和职位Value的键值对 >> 研发
+获取用户名和职位Key的键值对 >> qa
+获取用户名和职位Value的键值对 >> 测试
+从指定accounts中获取到的键值对数量 => 2
+从指定accounts中获取到的键值对数量 => 2
 
 */
 
-$accounts = array('!asd12d', '中文用户名', 'user10', 'dev33', 'cccfff');
+$accounts = array('!asd12d', '中文用户名', 'user10', 'user20', 'cccfff');
 $user  = new userTest();
 
-r($user->getUserRolesTest($accounts, true))         && p('dev33') && e('dev');  //获取用户名和职位Key的键值对
-r($user->getUserRolesTest($accounts, false))        && p('dev33') && e('研发'); //获取用户名和职位Value的键值对
-r(count($user->getUserRolesTest($accounts, true)))  && p()        && e(2);      //从指定accounts中获取到的键值对数量
-r(count($user->getUserRolesTest($accounts, false))) && p()        && e(2);      //从指定accounts中获取到的键值对数量
\ No newline at end of file
+r($user->getUserRolesTest($accounts, true))         && p('user20') && e('qa');   //获取用户名和职位Key的键值对
+r($user->getUserRolesTest($accounts, false))        && p('user20') && e('测试'); //获取用户名和职位Value的键值对
+r(count($user->getUserRolesTest($accounts, true)))  && p()        && e(2);       //从指定accounts中获取到的Key键值对数量
+r(count($user->getUserRolesTest($accounts, false))) && p()        && e(2);       //从指定accounts中获取到的Value键值对数量
diff --git a/test/model/user/resetpassword.php b/test/model/user/resetpassword.php
index 0142d6a943..6d9f256602 100755
--- a/test/model/user/resetpassword.php
+++ b/test/model/user/resetpassword.php
@@ -2,9 +2,10 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
 su('admin');
 
+zdTable('user')->gen(10);
+
 /**
 
 title=测试 userModel->resetPassword();
@@ -12,8 +13,8 @@ cid=1
 pid=1
 
 重设用户密码，返回重设后的加密后的密码 >> 367ef140036b0feb2f90d70d33255eea
-两次密码不相同的情况 >> 两次密码应该相同。
-密码强度小于系统设定 >> 您的密码强度小于系统设定。
+两次密码不相同的情况 >> 两次密码应该相同。<br/>
+密码强度小于系统设定 >> 密码必须6位及以上，且包含大小写字母、数字。<br/>
 使用常见简单密码，给出错误提示 >> 密码不能使用【123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123】这些常用弱口令。
 
 */
@@ -21,8 +22,8 @@ pid=1
 $user = new userTest();
 $normalUser = array();
 $normalUser['account']          = 'admin';
-$normalUser['password1']        = 'Adsd@#!%qaz';
-$normalUser['password2']        = 'Adsd@#!%qaz';
+$normalUser['password1']        = '367ef140036b0feb2f90d70d33255eea';
+$normalUser['password2']        = '367ef140036b0feb2f90d70d33255eea';
 $normalUser['passwordStrength'] = 1;
 
 $weakPassword = $normalUser;
@@ -32,11 +33,10 @@ $differentPassword = $normalUser;
 $differentPassword['password2'] = '!@#!@#asfasf';
 
 $simplePassword = $normalUser;
-$simplePassword['password1'] = '123456';
-$simplePassword['password2'] = '123456';
+$simplePassword['password1'] = 'e10adc3949ba59abbe56e057f20f883e';
+$simplePassword['password2'] = 'e10adc3949ba59abbe56e057f20f883e';
 
-r($user->resetPasswordTest($normalUser))         && p('password')    && e('367ef140036b0feb2f90d70d33255eea'); //重设用户密码，返回重设后的加密后的密码
-r($user->resetPasswordTest($differentPassword))  && p('password:0')  && e('两次密码应该相同。');               //两次密码不相同的情况
-r($user->resetPasswordTest($weakPassword))       && p('password1:0') && e('您的密码强度小于系统设定。');       //密码强度小于系统设定
-r($user->resetPasswordTest($simplePassword))     && p('password1:0') && e('密码不能使用【123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123】这些常用弱口令。'); //使用常见简单密码，给出错误提示
-$db->restoreDB();
\ No newline at end of file
+r($user->resetPasswordTest($normalUser))         && p('password')    && e('367ef140036b0feb2f90d70d33255eea');                 //重设用户密码，返回重设后的加密后的密码
+r($user->resetPasswordTest($differentPassword))  && p('password1:0') && e('两次密码应该相同。<br/>');                          //两次密码不相同的情况
+r($user->resetPasswordTest($weakPassword))       && p('password1:0') && e('密码必须6位及以上，且包含大小写字母、数字。<br/>'); //密码强度小于系统设定
+r($user->resetPasswordTest($simplePassword))     && p('password1')   && e('密码不能使用【123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123】这些常用弱口令。'); //使用常见简单密码，给出错误提示
diff --git a/test/model/user/update.php b/test/model/user/update.php
index cefbd7c875..e2e0698eed 100755
--- a/test/model/user/update.php
+++ b/test/model/user/update.php
@@ -2,7 +2,9 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
+
+zdTable('user')->gen(10);
+
 su('admin');
 
 /**
@@ -12,8 +14,8 @@ cid=1
 pid=1
 
 编辑用户，返回新的用户名 >> newtestuser4
-编辑用户，有重名用户的情况 >> 『用户名』已经有『newtestuser4』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
-两次密码不相同的情况 >> 两次密码应该相同。
+编辑用户，有重名用户的情况 >> 『用户名』已经有『admin』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。
+两次密码不相同的情况 >> 两次密码应该相同。<br/>
 用户名包含特殊字符的情况 >> 『用户名』只能是字母、数字或下划线的组合三位以上。
 
 */
@@ -22,14 +24,14 @@ $user = new userTest();
 $normalUser = array();
 $normalUser['account']          = 'newtestuser4';
 $normalUser['realname']         = '新的测试用户';
-$normalUser['password1']        = 'e10adc3949ba59abbe56e057f20f883e';
-$normalUser['password2']        = 'e10adc3949ba59abbe56e057f20f883e';
+$normalUser['password1']        = 'a0933c1218a4e745bacdcf572b10eba7';
+$normalUser['password2']        = 'a0933c1218a4e745bacdcf572b10eba7';
 $normalUser['type']             = 'inside';
 $normalUser['passwordStrength'] = 1;
 $normalUser['visions']          = 'rnd';
 
 $existUser = $normalUser;
-$existUser['account'] = 'adminasdasd';
+$existUser['account'] = 'admin';
 
 $differentPassword = $normalUser;
 $differentPassword['password2'] = 'asfjsdklj1234jkljsdklfj19';
@@ -37,8 +39,7 @@ $differentPassword['password2'] = 'asfjsdklj1234jkljsdklfj19';
 $specialUser = $normalUser;
 $specialUser['account'] = '!@#Asdsd中文';
 
-r($user->updateUserTest(1000, $normalUser))         && p('account')    && e('newtestuser4'); //编辑用户，返回新的用户名
-r($user->updateUserTest(1000, $existUser))          && p('account:0')  && e('『用户名』已经有『newtestuser4』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。');//编辑用户，有重名用户的情况
-r($user->updateUserTest(1000, $differentPassword))  && p('password:0') && e('两次密码应该相同。'); //两次密码不相同的情况
-r($user->updateUserTest(1000, $specialUser))        && p('account:0')  && e('『用户名』只能是字母、数字或下划线的组合三位以上。'); //用户名包含特殊字符的情况
-$db->restoreDB();
\ No newline at end of file
+r($user->updateUserTest(3, $normalUser))         && p('account')     && e('newtestuser4'); //编辑用户，返回新的用户名
+r($user->updateUserTest(3, $existUser))          && p('account:0')   && e('『用户名』已经有『admin』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。');//编辑用户，有重名用户的情况
+r($user->updateUserTest(3, $differentPassword))  && p('password1:0') && e('两次密码应该相同。<br/>'); //两次密码不相同的情况
+r($user->updateUserTest(3, $specialUser))        && p('account:0')   && e('『用户名』只能是字母、数字或下划线的组合三位以上。'); //用户名包含特殊字符的情况
diff --git a/test/model/user/updatepassword.php b/test/model/user/updatepassword.php
index 4a67298be2..a635604d4b 100755
--- a/test/model/user/updatepassword.php
+++ b/test/model/user/updatepassword.php
@@ -2,9 +2,10 @@
 <?php
 include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
 include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
-$db->switchDB();
 su('admin');
 
+zdTable('user')->gen(10);
+
 /**
 
 title=测试 userModel->updatePassword();
@@ -12,14 +13,14 @@ cid=1
 pid=1
 
 编辑用户密码，返回编辑后的密码 >> dcf859ce8dd8f998bdfe4ae6c22c329e
-两次密码不相同的情况 >> 两次密码应该相同。
-密码小于设定强度的情况 >> 您的密码强度小于系统设定。
+两次密码不相同的情况 >> 两次密码应该相同。<br/>
+密码小于设定强度的情况 >> 密码必须6位及以上，且包含大小写字母、数字。<br/>
 
 */
 
 $user = new userTest();
 $normalUser = array();
-$normalUser['originalPassword'] = 'e79f8fb9726857b212401e42e5b7e18b';
+$normalUser['originalPassword'] = 'bac0bbaaf7192f219bebd5387e88c5d7';
 $normalUser['password1']        = 'dcf859ce8dd8f998bdfe4ae6c22c329e';
 $normalUser['password2']        = 'dcf859ce8dd8f998bdfe4ae6c22c329e';
 $normalUser['passwordStrength'] = 1;
@@ -30,8 +31,6 @@ $weakPassword['passwordStrength'] = 0;
 $differentPassword = $normalUser;
 $differentPassword['password2'] = 'asdasfasf!@#!@#asfasf';
 
-r($user->updatePasswordTest(1000, $normalUser))         && p('password')    && e('dcf859ce8dd8f998bdfe4ae6c22c329e'); //编辑用户密码，返回编辑后的密码
-r($user->updatePasswordTest(1000, $differentPassword))  && p('password:0')  && e('两次密码应该相同。');               //两次密码不相同的情况
-r($user->updatePasswordTest(1000, $weakPassword))       && p('password1:0') && e('您的密码强度小于系统设定。');       //密码小于设定强度的情况
-
-$db->restoreDB();
\ No newline at end of file
+r($user->updatePasswordTest(10, $normalUser))         && p('password')    && e('dcf859ce8dd8f998bdfe4ae6c22c329e');                  //编辑用户密码，返回编辑后的密码
+r($user->updatePasswordTest(10, $differentPassword))  && p('password1:0') && e('两次密码应该相同。<br/>');                           //两次密码不相同的情况
+r($user->updatePasswordTest(10, $weakPassword))       && p('password1:0') && e('密码必须6位及以上，且包含大小写字母、数字。<br/>');  //密码小于设定强度的情况
diff --git a/test/model/user/updatesessionrandom.php b/test/model/user/updatesessionrandom.php
new file mode 100644
index 0000000000..a09442eca5
--- /dev/null
+++ b/test/model/user/updatesessionrandom.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::updateSessionRandom();
+cid=1
+pid=1
+
+random是否刷新 >> 1
+
+*/
+$user = new userTest();
+
+$user->updateSessionRandomTest();
+r($user->updateSessionRandomTest()) && p() && e('1'); // random是否刷新
diff --git a/www/theme/default/images/main/automation.png b/www/theme/default/images/main/automation.png
index 764ac5eaaa..3f78a31046 100644
Binary files a/www/theme/default/images/main/automation.png and b/www/theme/default/images/main/automation.png differ