diff --git a/application/admin/model/Admin.php b/application/admin/model/Admin.php
index 8c47f6f7..92107ce6 100644
--- a/application/admin/model/Admin.php
+++ b/application/admin/model/Admin.php
@@ -4,6 +4,7 @@ namespace app\admin\model;
 
 use think\Model;
 use think\Session;
+use fast\Random;
 
 class Admin extends Model
 {
@@ -15,14 +16,19 @@ class Admin extends Model
     protected $updateTime = 'updatetime';
 
     /**
-     * 重置用户密码
-     * @author baiyouwen
+     * 修改用户密码
+     *
+     * @param int $uid
+     * @param string $NewPassword
+     * @return boolean
      */
-    public function resetPassword($uid, $NewPassword)
+    public static function changePassword($uid, $NewPassword)
     {
-        $passwd = $this->encryptPassword($NewPassword);
-        $ret = $this->where(['id' => $uid])->update(['password' => $passwd]);
-        return $ret;
+        $salt = Random::alnum(6);
+        return self::where('id', $uid)->update([
+            'salt' => $salt, 
+            'password' => self::encryptPassword($NewPassword, $salt)
+        ]);
     }
 
     // 密码加密