Merge branch 'master' into feature/new-frontend-adaptation

# Conflicts:
#	backendApi/config/params.php

backendApi/config/menu.php

@@ -375,7 +375,7 @@ return [
             ['name'=>'Article Management', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'index', 'routePath'=>'article/index', 'show'=>1,],//文章列表
             ['name'=>'添加文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'add', 'routePath'=>'article/add', 'show'=>0,],
             ['name'=>'编辑文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'edit', 'routePath'=>'article/edit', 'show'=>0,],
-            ['name'=>'文章排序', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'sort', 'routePath'=>'article/sort', 'show'=>0,],
+            ['name'=>'文章排序', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'edit', 'routePath'=>'article/sort', 'show'=>0,],
             ['name'=>'删除文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'article-delete', 'routePath'=>'article/article-delete', 'show'=>0,],
             ['name'=>'文章详情', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'detail', 'routePath'=>'article/detail', 'show'=>0,],
             ['name'=>'隐藏文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'article-hide', 'routePath'=>'article/article-hide', 'show'=>0,],
@@ -449,6 +449,7 @@ return [
             ['name'=>'Ad list', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'list', 'routePath'=>'ad/list', 'show'=>0,],
             ['name'=>'Add', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'add', 'routePath'=>'ad/add', 'show'=>0,],
             ['name'=>'Edit', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'edit', 'routePath'=>'ad/edit', 'show'=>0,],
+            ['name'=>'Sort', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'edit', 'routePath'=>'ad/sort', 'show'=>0,],
             ['name'=>'Delete', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-delete', 'routePath'=>'ad/ad-delete', 'show'=>0,],
             ['name'=>'Hide', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-hide', 'routePath'=>'ad/ad-hide', 'show'=>0,],
             ['name'=>'Un-Hide', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-un-hide', 'routePath'=>'ad/ad-un-hide', 'show'=>0,],

common/libs/logging/operate/AdminOperate.php

@@ -50,7 +50,7 @@ class AdminOperate extends AbstractOperate {
             'save_before_content' => $this->saveBeforeContent,
             'save_after_content' => $this->saveAfterContent,
             'admin_id' => Yii::$app->user->id,
-            'admin_name' => isset(\Yii::$app->user->getUserInfo()['adminName']) ?\Yii::$app->user->getUserInfo()['adminName'] :$params['adminName'],
+            'admin_name' => isset(\Yii::$app->user->getUserInfo()['adminName']) ?\Yii::$app->user->getUserInfo()['adminName'] : ($params['adminName'] ?? \Yii::$app->user->id),
             'ip' => Yii::$app->request->getUserIP(),
             'request_route' => Yii::$app->requestedRoute,
             'opt_type' => $params['optType'],

vendor/yiisoft/yii2/web/ErrorHandler.php

@@ -163,14 +163,14 @@ class ErrorHandler extends \yii\base\ErrorHandler
                 }
                 if (YII_DEBUG) {
                     $it['type'] = get_class($exception);
-                    if (!$exception instanceof UserException) {
-                        $it['file'] = $exception->getFile();
-                        $it['line'] = $exception->getLine();
-                        $it['stack-trace'] = explode("\n", $exception->getTraceAsString());
+//                    if (!$exception instanceof UserException) {
+                        $it['file'] = $exception->getFile() ?? '';
+                        $it['line'] = $exception->getLine() ?? '';
+                        $it['stack-trace'] = explode("\n", $exception->getTraceAsString()) ?? '';
                         if ($exception instanceof \yii\db\Exception) {
-                            $it['error-info'] = $exception->errorInfo;
+                            $it['error-info'] = $exception->errorInfo ?? '';
                         }
-                    }
+//                    }
                 }
                 if (($prev = $exception->getPrevious()) !== null) {
                     $it['previous'] = $this->convertExceptionToArray($prev);