框架升级及修复升级后的bug

backend/application/admin/controller/Ajax.php

@@ -6,24 +6,22 @@ use app\common\controller\Backend;
 use app\common\exception\UploadException;
 use app\common\library\OssUpload;
 use app\common\library\Upload;
+use fast\Random;
 use think\addons\Service;
 use think\Cache;
 use think\Config;
 use think\Db;
 use think\Lang;
 use think\Loader;
-use think\Log;
 use think\Response;
 use think\Validate;
 
-
 /**
  * Ajax异步请求接口
  * @internal
  */
 class Ajax extends Backend
 {
-
     protected $noNeedLogin = ['lang'];
     protected $noNeedRight = ['*'];
     protected $layout = '';
@@ -241,18 +239,18 @@ class Ajax extends Backend
             $weighdata[$v[$prikey]] = $v[$field];
         }
         $position = array_search($changeid, $ids);
-        $desc_id = isset($sour[$position]) ? $sour[$position] : end($sour);    //移动到目标的ID值,取出所处改变前位置的值
+        $desc_id = $sour[$position] ?? end($sour);    //移动到目标的ID值,取出所处改变前位置的值
         $sour_id = $changeid;
-        $weighids = array();
+        $weighids = [];
         $temp = array_values(array_diff_assoc($ids, $sour));
         foreach ($temp as $m => $n) {
             if ($n == $sour_id) {
                 $offset = $desc_id;
             } else {
                 if ($sour_id == $temp[0]) {
-                    $offset = isset($temp[$m + 1]) ? $temp[$m + 1] : $sour_id;
+                    $offset = $temp[$m + 1] ?? $sour_id;
                 } else {
-                    $offset = isset($temp[$m - 1]) ? $temp[$m - 1] : $sour_id;
+                    $offset = $temp[$m - 1] ?? $sour_id;
                 }
             }
             if (!isset($weighdata[$offset])) {
@@ -273,7 +271,6 @@ class Ajax extends Backend
             $type = $this->request->request("type");
             switch ($type) {
                 case 'all':
-                    // no break
                 case 'content':
                     //内容缓存
                     rmdirs(CACHE_PATH, false);
@@ -281,18 +278,21 @@ class Ajax extends Backend
                     if ($type == 'content') {
                         break;
                     }
+                    // no break
                 case 'template':
                     // 模板缓存
                     rmdirs(TEMP_PATH, false);
                     if ($type == 'template') {
                         break;
                     }
+                    // no break
                 case 'addons':
                     // 插件缓存
                     Service::refresh();
                     if ($type == 'addons') {
                         break;
                     }
+                    // no break
                 case 'browser':
                     // 浏览器缓存
                     // 只有生产环境下才修改
@@ -389,5 +389,4 @@ class Ajax extends Backend
         $response = Response::create($data, '', 200, $header);
         return $response;
     }
-
 }

backend/application/admin/controller/Category.php

@@ -112,6 +112,7 @@ class Category extends Backend
             $params = $this->request->post("row/a");
             if ($params) {
                 $params = $this->preExcludeFields($params);
+                $params = $this->preExcludePrimaryKey($params);
 
                 if ($params['pid'] != $row['pid']) {
                     $childrenIds = Tree::instance()->init(collection(\app\common\model\Category::select())->toArray())->getChildrenIds($row['id'], true);

backend/application/admin/controller/auth/Admin.php

@@ -176,6 +176,7 @@ class Admin extends Backend
             $this->token();
             $params = $this->request->post("row/a");
             if ($params) {
+                $params = $this->preExcludePrimaryKey($params);
                 Db::startTrans();
                 try {
                     if ($params['password']) {

backend/application/admin/controller/auth/Adminlog.php

@@ -18,21 +18,13 @@ class Adminlog extends Backend
      * @var \app\admin\model\AdminLog
      */
     protected $model = null;
-    protected $childrenGroupIds = [];
     protected $childrenAdminIds = [];
 
     public function _initialize()
     {
         parent::_initialize();
         $this->model = model('AdminLog');
-
         $this->childrenAdminIds = $this->auth->getChildrenAdminIds(true);
-        $this->childrenGroupIds = $this->auth->getChildrenGroupIds(true);
-
-        $groupName = AuthGroup::where('id', 'in', $this->childrenGroupIds)
-            ->column('id,name');
-
-        $this->view->assign('groupdata', $groupName);
     }
 
     /**

backend/application/admin/controller/auth/Group.php

@@ -132,6 +132,7 @@ class Group extends Backend
         if ($this->request->isPost()) {
             $this->token();
             $params = $this->request->post("row/a", [], 'strip_tags');
+            $params = $this->preExcludePrimaryKey($params);
             //父节点不能是非权限内节点
             if (!in_array($params['pid'], $this->childrenGroupIds)) {
                 $this->error(__('The parent group exceeds permission limit'));

backend/application/admin/controller/auth/Rule.php

@@ -82,7 +82,6 @@ class Rule extends Backend
                 if ($result === false) {
                     $this->error($this->model->getError());
                 }
-                Cache::rm('__menu__');
                 $this->success();
             }
             $this->error();
@@ -115,6 +114,7 @@ class Rule extends Backend
                         $this->error(__('Can not change the parent to child'));
                     }
                 }
+                $params = $this->preExcludePrimaryKey($params);
                 //这里需要针对name做唯一验证
                 $ruleValidate = \think\Loader::validate('AuthRule');
                 $ruleValidate->rule([
@@ -124,7 +124,6 @@ class Rule extends Backend
                 if ($result === false) {
                     $this->error($row->getError());
                 }
-                Cache::rm('__menu__');
                 $this->success();
             }
             $this->error();