Merge pull request #1 from yincart2/develop

v0.3.0

.gitignore

@@ -29,3 +29,8 @@ phpunit.phar
 # local phpunit config
 /phpunit.xml
 star-image/
+
+star-merchant/runtime
+star-cluster/runtime
+star-core/runtime
+star-citizen/runtime

README.md

@@ -29,6 +29,14 @@ Yincart2 Galaxy System
 
 微信商城
 
+### star Merchant
+
+商家后台
+
+### star Image
+
+图片空间
+
 虚拟域名配置说明
 ----------------
 
@@ -38,6 +46,10 @@ home.dev 对应star-home
 
 cluster.dev 对应star-cluster
 
+image.dev 对应star-image
+
+merchant.dev 对应star-merchant
+
 ....
 
 命名规则为xxx.dev对应star-xxx
@@ -47,6 +59,10 @@ cluster.dev 对应star-cluster
 
 数据库位于console/data/galaxy_latest.sql
 
+Migration
+--------
+yii migrate/up system_v0_1_0 --migrationPath=@star/system/migrations
+
 YII2 DIRECTORY STRUCTURE
 -------------------
 

common/config/bootstrap.php

@@ -1,11 +1,12 @@
 <?php
 Yii::setAlias('common', dirname(__DIR__));
+Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('cluster', dirname(dirname(__DIR__)) . '/star-cluster');
 Yii::setAlias('home', dirname(dirname(__DIR__)) . '/star-home');
 Yii::setAlias('core', dirname(dirname(__DIR__)) . '/star-core');
 Yii::setAlias('wechat', dirname(dirname(__DIR__)) . '/star-wechat');
 Yii::setAlias('matter', dirname(dirname(__DIR__)) . '/star-matter');
 Yii::setAlias('star', dirname(dirname(__DIR__)) . '/star-modules');
 Yii::setAlias('theme', dirname(dirname(__DIR__)) . '/star-themes');
-Yii::setAlias('console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('image', dirname(dirname(__DIR__)) . '/star-image');
+Yii::setAlias('merchant', dirname(dirname(__DIR__)) . '/star-merchant');

common/config/main.php

@@ -2,6 +2,7 @@
 return [
     'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
     'language' => 'zh-CN',
+    'timeZone' => 'Asia/Shanghai',
     'sourceLanguage' => 'en-US',
     'modules' => [
         'blog' => [
@@ -10,14 +11,17 @@
         'utility' => [
             'class' => 'c006\utility\migration\Module',
         ],
-        'gridview' =>  [
+        'gridview' => [
             'class' => '\kartik\grid\Module',
             'i18n' => [
                 'class' => 'yii\i18n\PhpMessageSource',
                 'basePath' => '@kvgrid/messages',
                 'forceTranslation' => true
             ]
-        ]
+        ],
+        'auth' => [
+            'class'=>'star\auth\Module',
+        ],
     ],
     'components' => [
         'i18n' => [
@@ -40,7 +44,27 @@
                     'class' => 'yii\i18n\PhpMessageSource',
                     'sourceLanguage' => 'en-US',
                     'basePath' => '@star/order/messages',
-                ]
+                ],
+                'marketing' => [
+                    'class' => 'yii\i18n\PhpMessageSource',
+                    'sourceLanguage' => 'en-US',
+                    'basePath' => '@star/marketing/messages',
+                ],
+                'account' => [
+                    'class' => 'yii\i18n\PhpMessageSource',
+                    'sourceLanguage' => 'en-US',
+                    'basePath' => '@star/account/messages',
+                ],
+                'refund' => [
+                    'class' => 'yii\i18n\PhpMessageSource',
+                    'sourceLanguage' => 'en-US',
+                    'basePath' => '@star/refund/messages',
+                ],
+                'member' => [
+                    'class' => 'yii\i18n\PhpMessageSource',
+                    'sourceLanguage' => 'en-US',
+                    'basePath' => '@star/member/messages',
+                ],
             ],
         ],
         'urlManager' => [
@@ -49,7 +73,7 @@
             'enableStrictParsing' => false,
             'rules' => [
                 '<controller:\w+>s' => '<controller>/index',
-                '<controller:\w+>/<id:\d+>'        => '<controller>/view',
+                '<controller:\w+>/<id:\d+>' => '<controller>/view',
             ],
         ],
         'cache' => [