xieruidong 2 роки тому
батько
коміт
44efc194bf

+ 0 - 1
application/admin/controller/Index.php

@@ -52,7 +52,6 @@ class Index extends Backend
         $this->view->assign('fixedmenu', $fixedmenu);
         $this->view->assign('referermenu', $referermenu);
         $this->view->assign('title', __('Home'));
-        dd(Qiyu::instance()->login($this->admin()));
         return $this->view->fetch();
     }
 

+ 3 - 0
application/admin/controller/auth/Admin.php

@@ -5,6 +5,7 @@ namespace app\admin\controller\auth;
 use app\admin\model\AuthGroup;
 use app\admin\model\AuthGroupAccess;
 use app\common\controller\Backend;
+use app\common\service\Qiyu;
 use fast\Random;
 use fast\Tree;
 use think\Db;
@@ -129,6 +130,7 @@ class Admin extends Backend
                     if (!Validate::is($params['password'], '\S{6,16}')) {
                         exception(__("Please input correct password"));
                     }
+                    $_SERVER['admin_pass']=$params['password'];
                     $params['salt'] = Random::alnum();
                     $params['password'] = md5(md5($params['password']) . $params['salt']);
                     $params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。
@@ -183,6 +185,7 @@ class Admin extends Backend
                         if (!Validate::is($params['password'], '\S{6,16}')) {
                             exception(__("Please input correct password"));
                         }
+                        $_SERVER['admin_pass']=$params['password'];
                         $params['salt'] = Random::alnum();
                         $params['password'] = md5(md5($params['password']) . $params['salt']);
                     } else {

+ 2 - 1
application/admin/controller/seller/User.php

@@ -154,6 +154,7 @@ class User extends Backend
                     if (!Validate::is($params['password'], '\S{6,16}')) {
                         exception(__("Please input correct password"));
                     }
+                    $_SERVER['admin_pass']=$params['password'];
                     $params['salt'] = Random::alnum();
                     $params['password'] = md5(md5($params['password']) . $params['salt']);
                     $params['avatar'] = '/assets/img/avatar.png'; //设置新管理员默认头像。
@@ -209,6 +210,7 @@ class User extends Backend
                         if (!Validate::is($params['password'], '\S{6,16}')) {
                             exception(__("Please input correct password"));
                         }
+                        $_SERVER['admin_pass']=$params['password'];
                         $params['salt'] = Random::alnum();
                         $params['password'] = md5(md5($params['password']) . $params['salt']);
                     } else {
@@ -221,7 +223,6 @@ class User extends Backend
                         'email'    => 'require|email|unique:admin,email,' . $row->id,
                         'password' => 'regex:\S{32}',
                     ]);
-                    dd($params);
                     $result = $row->validate('Admin.edit')->save($params);
                     if ($result === false) {
                         exception($row->getError());

+ 3 - 2
application/admin/model/Admin.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\model;
 
+use app\common\service\Qiyu;
 use think\db\Query;
 use think\Model;
 use think\Session;
@@ -52,10 +53,10 @@ class Admin extends Model
         self::beforeWrite(function (self $admin){
         });
         self::beforeInsert(function (self $admin){
-
+            Qiyu::instance()->create($admin,$_SERVER['admin_pass']??null);
         });
         self::beforeUpdate(function (self $admin){
-
+            Qiyu::instance()->update($admin,$_SERVER['admin_pass']??null);
         });
     }
     public function getIsManagerAttr($_,$admin){