Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/config/main.php

@@ -41,36 +41,6 @@ return [
         // 'errorHandler' => [
         //     'errorAction' => 'site/error',
         // ],
-        
-        'urlManager' => [
-            'enablePrettyUrl' => true,
-            'showScriptName' => false,
-            'enableStrictParsing'=>true,
-            'rules' => [
-                [
-                    'class'=>'yii\rest\UrlRule',
-                    'controller'=>[
-                        'swagger',
-                        'v1/shop/branch/branch',
-                        'v1/rbacuser/rbac-user',
-                        'v1/shopuser/shop-user-membergrade',
-                        'v1/shopuser/user-department',
-                        'v1/shopuser/shop-user',
-                        'v1/shopuser/user-complain',
-                    ],
-                    'extraPatterns'=>[
-                        'GET,OPTIONS test'=>'test',
-                        'GET swagger'=>'swagger',
-                        'POST login'=>'login',
-                        'GET,OPTIONS department'=>'department',
-                        'GET,OPTIONS user-complain'=>'user-complain',
-                        'GET employee-info' => 'employee-info',
-                        'GET employee-list' => 'employee-list',
-                    ],
-                ],
-                'GET swaggers/swagger/<id>'=>'swagger/swagger',
-            ],
-        ],
         'redis' => [
             'class' => 'yii\redis\Connection',
             'hostname' => 'r-m5ed79b6945c5a14.redis.rds.aliyuncs.com',

backend/config/urlmanager.php

+<?php
+// db配置
+return [
+    'components' => [
+        'urlManager' => [
+            'enablePrettyUrl' => true,
+            'showScriptName' => false,
+            'enableStrictParsing'=>true,
+            'rules' => [
+                [
+                    'class'=>'yii\rest\UrlRule',
+                    'controller'=>[
+                        'swagger',
+                        'v1/shop/branch/branch',
+                        'v1/rbacuser/rbac-user',
+                        'v1/shopuser/shop-user-membergrade',
+                        'v1/shopuser/user-department',
+                        'v1/shopuser/shop-user',
+                        'v1/shopuser/user-complain',
+                    ],
+                    'extraPatterns'=>[
+                        'GET,OPTIONS test'=>'test',
+                        'GET swagger'=>'swagger',
+                        'POST login'=>'login',
+                        'GET,OPTIONS department'=>'department',
+                        'GET,OPTIONS user-complain'=>'user-complain',
+                        'GET employee-info' => 'employee-info',
+                        'GET employee-list' => 'employee-list',
+                    ],
+                ],
+                'GET swaggers/swagger/<id>'=>'swagger/swagger',
+            ],
+        ],
+    ]
+];

backend/controllers/v1/rbacuser/RbacUserController.php

@@ -15,12 +15,14 @@ class RbacUserController extends BaseController
  *     summary="后台登陆接口",
  *     description="后台登陆接口",
  *     @OA\RequestBody(
+ *       required=true,
  *       @OA\MediaType(
- *             mediaType="application/json",
+ *           mediaType="application/x-www-form-urlencoded",
  *           @OA\Schema(
- *                 @OA\Property(property="CODE",type="string"),
- *                 @OA\Property(property="PASSWORD",type="string"),
- *                 example={"CODE": 1234567890, "PASSWORD": "123"}
+ *               type="object",
+ *               @OA\Property(property="CODE",description="用户CODE",type="string"),
+ *               @OA\Property(property="PASSWORD",description="密码",type="string"),
+ *               example={"CODE": "1234567890", "PASSWORD": "123"}
  *           )
  *       )
  *     ),

backend/web/index.php

@@ -12,7 +12,8 @@ $config = yii\helpers\ArrayHelper::merge(
     require __DIR__ . '/../../common/config/main-local.php',
     require __DIR__ . '/../config/main.php',
     require __DIR__ . '/../config/main-local.php',
-    require __DIR__ . '/../config/db.php'
+    require __DIR__ . '/../config/db.php',
+    require __DIR__ . '/../config/urlmanager.php'
 );
 
 (new yii\web\Application($config))->run();