refactor: composer 优化

myloveGy · Jun 22, 2019 · fe4a8a2 · fe4a8a2
1 parent 6bec9a7
commit fe4a8a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/backend/config/main.php b/backend/config/main.php
@@ -8,14 +8,15 @@
 
 return [
     'id'                  => 'app-backend',
+    'name'                => 'Yii Ace Admin',
     'basePath'            => dirname(__DIR__),
     'controllerNamespace' => 'backend\controllers',
     'bootstrap'           => ['log'],
     'language'            => 'zh-CN',
     'modules'             => [
         'admin' => [
             'class' => 'jinxing\admin\Module',
-            'user'  => 'user'
+            'user'  => 'user',
         ],
     ],
     'components'          => [
@@ -49,14 +50,14 @@
             'bundles' => [
                 // 去掉自己的bootstrap 资源
                 'yii\bootstrap\BootstrapAsset' => [
-                    'css' => []
+                    'css' => [],
                 ],
                 // 去掉自己加载的Jquery
                 'yii\web\JqueryAsset'          => [
                     'sourcePath' => null,
                     'js'         => [],
                 ],
-            ]
+            ],
         ],
 
         // authority management
@@ -77,7 +78,7 @@
                 'admin' => [
                     'class'          => 'yii\i18n\PhpMessageSource',
                     'sourceLanguage' => 'en',
-                    'basePath'       => '@jinxing/admin/messages'
+                    'basePath'       => '@jinxing/admin/messages',
                 ],
             ],
         ],

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     "yiisoft/yii2": "~2.0.14",
     "yiisoft/yii2-bootstrap": "~2.0.0",
     "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0",
-    "jinxing/yii2-admin": "dev-master"
+    "jinxing/yii2-admin": "~1.2.0"
   },
   "require-dev": {
     "yiisoft/yii2-debug": "~2.1.0",
@@ -42,12 +42,6 @@
     "codeception/verify": "~1.0.0"
   },
   "config": {
-    "process-timeout": 1800,
-    "fxp-asset": {
-      "installer-paths": {
-        "npm-asset-library": "vendor/npm",
-        "bower-asset-library": "vendor/bower"
-      }
-    }
+    "process-timeout": 1800
   }
 }