Merge remote-tracking branch 'origin/dev' into dev

src/environments/dev/common/config/main-local.php

@@ -3,11 +3,8 @@ return [
     'components' => [
         'cache' => [
             'class' => 'yii\redis\Cache',
-            'redis' => [
-                'hostname' => '192.168.1.185',
-                'port' => 6379,
-                'database' => 0,
-            ]
+            'redis' => 'redis',
+            'keyPrefix' => 'yunya::'
         ],
         'db' => [
             'class' => 'yii\db\Connection',

src/environments/dev/frontend/config/main-local.php

@@ -14,11 +14,17 @@ $config = [
             'timeout' => 3600,
             'name' => 'zuiektang-frontend',
             'class' => 'yii\redis\Session',
-            'redis' => [
-                'hostname' => '192.168.1.185',
-                'port' => 6379,
-                'database' => 0,
-            ]
+            'redis' => 'redis'
+        ],
+        'log' => [
+            'traceLevel' => YII_DEBUG ? 3 : 0,
+            'targets' => [
+                [
+                    'class' => 'yii\log\FileTarget',
+                    'levels' => ['error', 'warning'],
+                    'logFile'=>'@runtime/logs/app-'.date('Y-m-d',time()).'.log',
+                ],
+            ],
         ],
     ],
 ];

src/environments/prod/common/config/main-local.php

@@ -3,11 +3,8 @@ return [
     'components' => [
         'cache' => [
             'class' => 'yii\redis\Cache',
-            'redis' => [
-                'hostname' => '192.168.1.21',
-                'port' => 6380,
-                'database' => 2,
-            ]
+            'redis' => 'redis',
+            'keyPrefix' => 'yunya::'
         ],
         'db' => [
             'class' => 'yii\db\Connection',

src/environments/prod/frontend/config/main-local.php

@@ -13,11 +13,19 @@ $config = [
             'timeout' => 3600,
             'name' => 'zuiektang-frontend',
             'class' => 'yii\redis\Session',
-            'redis' => [
-                'hostname' => '192.168.1.21',
-                'port' => 6380,
-                'database' => 2,
-            ]
+            'redis' => 'redis'
+        ],
+        'log' => [
+            'traceLevel' => YII_DEBUG ? 3 : 0,
+            'targets' => [
+                [
+                    'class' => 'yii\log\FileTarget',
+                    'levels' => ['error', 'warning'],
+                    'except'=>['yii\web\HttpException:*', 'yii\i18n\I18N\*'],
+                    'logFile'=>'@runtime/logs/app-'.date('Y-m-d',time()).'.log',
+                    'logVars'=>[],
+                ],
+            ],
         ],
     ],
 ];

src/frontend/config/main.php

@@ -35,15 +35,6 @@ return [
                 $user->save();
             }
         ],
-        'log' => [
-            'traceLevel' => YII_DEBUG ? 3 : 0,
-            'targets' => [
-                [
-                    'class' => 'yii\log\FileTarget',
-                    'levels' => ['error', 'warning'],
-                ],
-            ],
-        ],
         'errorHandler' => [
             'errorAction' => 'site/error',
         ],

src/frontend/views/site/login.php

@@ -32,12 +32,11 @@ $baseUrl = \yii\helpers\Url::base();
 
 
                     <div class=" input-wrapper">
-                        <input name="telephone" value="<?= $model->telephone ?>" type="text" class="" placeholder="手机号码"
-                               autofocus="">
+                        <input name="telephone" value="<?= $model->telephone ?>" type="text" class="" placeholder="手机号码" autofocus="">
+                        <span class="tips"><?=$model->getFirstError('password')?></span>
                     </div>
                     <div class=" input-wrapper last-wrapper">
                         <input name="password" type="password" class="" placeholder="密码">
-                        <span class="tips tip-vcode"><?=$model->getFirstError('password')?></span>
                     </div>
                 </div>