From 7d30a9f11ce030af81974e717abde539b29155d0 Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Thu, 14 May 2020 16:45:01 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E5=AE=8C=E5=96=84=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Auth.php         | 81 ++++++++-----------
 composer.json                                 |  2 +-
 .../20190513155519_ini_admin_menu.php         | 10 +++
 route/route.php                               |  4 +
 4 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php
index 10c7476..7042073 100644
--- a/application/admin/controller/Auth.php
+++ b/application/admin/controller/Auth.php
@@ -98,29 +98,13 @@ class Auth extends Base {
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
     public function add() {
-        $rules = [];
-        $postData = $this->request->post();
-        if ($postData['rules']) {
-            $rules = $postData['rules'];
-            $rules = array_filter($rules);
-        }
-        unset($postData['rules']);
-        $res = AdminAuthGroup::create($postData);
+        $res = AdminAuthGroup::create([
+            'name'        => $this->request->post('name', ''),
+            'description' => $this->request->post('description', '')
+        ]);
         if ($res === false) {
             return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
         }
-        if ($rules) {
-            $insertData = [];
-            foreach ($rules as $value) {
-                if ($value) {
-                    $insertData[] = [
-                        'group_id' => $res->id,
-                        'url'      => $value
-                    ];
-                }
-            }
-            (new AdminAuthRule())->saveAll($insertData);
-        }
 
         return $this->buildSuccess();
     }
@@ -154,12 +138,10 @@ class Auth extends Base {
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
     public function edit() {
-        $postData = $this->request->post();
-        if ($postData['rules']) {
-            $this->editRule();
-        }
-        unset($postData['rules']);
-        $res = AdminAuthGroup::update($postData);
+        $res = AdminAuthGroup::update([
+            'name'        => $this->request->post('name', ''),
+            'description' => $this->request->post('description', '')
+        ]);
         if ($res === false) {
             return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
         }
@@ -262,30 +244,33 @@ class Auth extends Base {
      * @throws \think\exception\DbException
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
-    private function editRule() {
-        $postData = $this->request->post();
-        $needAdd = [];
-        $has = (new AdminAuthRule())->where(['group_id' => $postData['id']])->select();
-        $has = Tools::buildArrFromObj($has);
-        $hasRule = array_column($has, 'url');
-        $needDel = array_flip($hasRule);
-        foreach ($postData['rules'] as $key => $value) {
-            if (!empty($value)) {
-                if (!in_array($value, $hasRule)) {
-                    $data['url'] = $value;
-                    $data['group_id'] = $postData['id'];
-                    $needAdd[] = $data;
-                } else {
-                    unset($needDel[$value]);
+    public function editRule() {
+        $id = $this->request->post('id', 0);
+        $rules = $this->request->post('rules', []);
+        if ($rules) {
+            $needAdd = [];
+            $has = (new AdminAuthRule())->where(['group_id' => $id])->select();
+            $has = Tools::buildArrFromObj($has);
+            $hasRule = array_column($has, 'url');
+            $needDel = array_flip($hasRule);
+            foreach ($rules as $key => $value) {
+                if (!empty($value)) {
+                    if (!in_array($value, $hasRule)) {
+                        $data['url'] = $value;
+                        $data['group_id'] = $id;
+                        $needAdd[] = $data;
+                    } else {
+                        unset($needDel[$value]);
+                    }
                 }
             }
-        }
-        if (count($needAdd)) {
-            (new AdminAuthRule())->saveAll($needAdd);
-        }
-        if (count($needDel)) {
-            $urlArr = array_keys($needDel);
-            (new AdminAuthRule())->whereIn('url', $urlArr)->where('group_id', $postData['id'])->delete();
+            if (count($needAdd)) {
+                (new AdminAuthRule())->saveAll($needAdd);
+            }
+            if (count($needDel)) {
+                $urlArr = array_keys($needDel);
+                (new AdminAuthRule())->whereIn('url', $urlArr)->where('group_id', $id)->delete();
+            }
         }
     }
 }
diff --git a/composer.json b/composer.json
index 0000220..5074b6f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.0",
         "topthink/framework": "5.1.*",
         "topthink/think-migration": "^2.0",
         "guzzlehttp/guzzle": "^6.5"
diff --git a/database/migrations/20190513155519_ini_admin_menu.php b/database/migrations/20190513155519_ini_admin_menu.php
index 081805a..8571667 100644
--- a/database/migrations/20190513155519_ini_admin_menu.php
+++ b/database/migrations/20190513155519_ini_admin_menu.php
@@ -700,6 +700,16 @@ class IniAdminMenu extends Migrator {
                 'hide'  => 0,
                 'icon'  => '',
                 'level' => 0
+            ], [
+                'id'    => 71,
+                'name'  => '编辑权限细节',
+                'fid'   => 15,
+                'url'   => 'admin/Auth/editRule',
+                'auth'  => 0,
+                'sort'  => 0,
+                'hide'  => 0,
+                'icon'  => '',
+                'level' => 0
             ]
         ];
 
diff --git a/route/route.php b/route/route.php
index a6c8207..33735eb 100644
--- a/route/route.php
+++ b/route/route.php
@@ -118,6 +118,10 @@ Route::group('admin', function() {
             'admin/Auth/delMember',
             ['method' => 'get']
         ],
+        'editRule'     => [
+            'admin/Auth/editRule',
+            ['method' => 'post']
+        ],
         'edit'         => [
             'admin/Auth/edit',
             ['method' => 'post']