Merge branch 'antshop' of https://git.dev.tencent.com/linyaostalker/Antbasic into antshop

backend/config/main.php

@@ -11,7 +11,13 @@ return [
     'bootstrap' => ['log'],
     'modules' => [
         'goods' => [
-            'class' => 'goods\Module',
+            'class' => '\backend\modules\goods\Module',
+        ],
+        'file' => [
+            'class' => '\backend\modules\file\Module',
+        ],
+        'shop' => [
+            'class' => '\backend\modules\shop\Module',
         ],
     ],
     'components' => [
@@ -22,7 +28,7 @@ return [
             'csrfParam' => '_csrf-api',
         ],
         'user' => [
-            'identityClass' => 'backend\models\User',
+            'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
             'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true],
         ],

backend/models/LoginForm.php

@@ -4,6 +4,7 @@ namespace backend\models;
 
 use Yii;
 use yii\base\Model;
+use common\models\User;
 
 /**
  * Login form

backend/modules/file/Module.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace backend\modules\file;
+
+/**
+ * file module definition class
+ */
+class Module extends \yii\base\Module
+{
+    /**
+     * {@inheritdoc}
+     */
+    public $controllerNamespace = 'backend\modules\file\controllers';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+        parent::init();
+
+        // custom initialization code goes here
+    }
+}