yanglin 7 years ago
parent
commit
20410241e0

+ 3 - 1
api/config/main.php

@@ -65,7 +65,9 @@ return [
             ]
         ],
 
-        'db' =>   require __DIR__ . '/../../common/config/db.php'
+        'db' =>   require __DIR__ . '/../../common/config/db.php',
+        'redis' =>   require __DIR__ . '/../../common/config/redis.php',
+
     ],
     'params' => $params,
 ];

+ 0 - 12
common/config/main.php

@@ -9,17 +9,5 @@ return [
         'cache' => [
             'class' => 'yii\caching\FileCache',
         ],
-
-        'redis' => [
-            'class' => 'yii\redis\Connection',
-            'hostname' => 'localhost',
-            'port' => 6378,
-            'database' => 1,
-            'password' => 'airent-redis~123',
-        ],
     ],
-    'params'=>array(
-        // this is used in contact page
-        'rabbithost' => 'localhost',
-    ),
 ];

+ 1 - 0
common/config/params.php

@@ -3,4 +3,5 @@ return [
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
+    'rabbithost' =>"localhost",
 ];

+ 5 - 0
common/config/rabbitmq-local.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'rabbithost' =>"172.30.118.225",
+];

+ 8 - 0
common/config/redis-local.php

@@ -0,0 +1,8 @@
+<?php
+return [
+    'class' => 'yii\redis\Connection',
+    'hostname' => 'localhost',
+    'port' => 6379,
+    'database' => 0,
+];
+

+ 8 - 0
common/config/redis.php

@@ -0,0 +1,8 @@
+<?php
+return [
+    'class' => 'yii\redis\Connection',
+    'hostname' => 'localhost',
+    'port' => 6378,
+    'database' => 1,
+    'password' => 'airent-redis~123',
+];

+ 1 - 1
components/RabbitBase.php

@@ -60,7 +60,7 @@ class RabbitBase {
 
     public static function CallMq($n){
         $connection =   new AMQPStreamConnection(
-            self::HOST, self::PORT, self::USER, self::PASS); //建立连接
+            \Yii::$app->params['rabbithost'], self::PORT, self::USER, self::PASS); //建立连接
         $channel = $connection->channel();
         $channel->queue_declare('login', false, true, false, false);
         $data=empty($n)?"Hello World!":$n;

+ 1 - 1
frontend/models/SignupForm.php

@@ -42,7 +42,7 @@ class SignupForm extends Model
     public function attributeLabels()
     {
         return [
-            'username' => '验证码',
+            'username' => '姓名',
             'name' => '姓名',
             'email' => '电子邮件',
             'password' => '密码',

+ 2 - 2
frontend/views/site/login.php

@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="site-login">
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>Please fill out the following fields to login:</p>
+    <p>请填写登入信息:</p>
 
     <div class="row">
         <div class="col-lg-5">
@@ -26,7 +26,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?= $form->field($model, 'rememberMe')->checkbox() ?>
 
                 <div style="color:#999;margin:1em 0">
-                    If you forgot your password you can <?= Html::a('reset it', ['site/request-password-reset']) ?>.
+                    忘记密码 <?= Html::a('reset it', ['site/request-password-reset']) ?>.
                 </div>
 
                 <div class="form-group">

+ 35 - 0
nohup.out

@@ -0,0 +1,35 @@
+Exception 'yii\db\Exception' with message 'SQLSTATE[HY000] [2002] Connection refused'
+
+in /app/code/yii2/advance/vendor/yiisoft/yii2/db/Connection.php:597
+
+Stack trace:
+#0 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Connection.php(943): yii\db\Connection->open()
+#1 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Connection.php(930): yii\db\Connection->getMasterPdo()
+#2 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Command.php(243): yii\db\Connection->getSlavePdo()
+#3 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Command.php(1062): yii\db\Command->prepare(true)
+#4 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Command.php(386): yii\db\Command->queryInternal('fetchAll', NULL)
+#5 /app/code/yii2/advance/vendor/yiisoft/yii2/db/mysql/Schema.php(320): yii\db\Command->queryAll()
+#6 /app/code/yii2/advance/vendor/yiisoft/yii2/db/mysql/Schema.php(111): yii\db\mysql\Schema->findColumns(Object(yii\db\TableSchema))
+#7 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Schema.php(662): yii\db\mysql\Schema->loadTableSchema('rabbit_log')
+#8 /app/code/yii2/advance/vendor/yiisoft/yii2/db/Schema.php(173): yii\db\Schema->getTableMetadata('rabbit_log', 'schema', false)
+#9 /app/code/yii2/advance/vendor/yiisoft/yii2/db/ActiveRecord.php(346): yii\db\Schema->getTableSchema('rabbit_log')
+#10 /app/code/yii2/advance/vendor/yiisoft/yii2/db/ActiveRecord.php(380): yii\db\ActiveRecord::getTableSchema()
+#11 /app/code/yii2/advance/vendor/yiisoft/yii2/db/BaseActiveRecord.php(474): yii\db\ActiveRecord->attributes()
+#12 /app/code/yii2/advance/vendor/yiisoft/yii2/db/BaseActiveRecord.php(304): yii\db\BaseActiveRecord->hasAttribute('msg')
+#13 /app/code/yii2/advance/console/controllers/RabbitUserController.php(106): yii\db\BaseActiveRecord->__set('msg', '{"body":"{\\"typ...')
+#14 [internal function]: console\controllers\RabbitUserController->console\controllers\{closure}(Object(PhpAmqpLib\Message\AMQPMessage))
+#15 /app/code/yii2/advance/vendor/php-amqplib/php-amqplib/PhpAmqpLib/Channel/AMQPChannel.php(983): call_user_func(Object(Closure), Object(PhpAmqpLib\Message\AMQPMessage))
+#16 [internal function]: PhpAmqpLib\Channel\AMQPChannel->basic_deliver(Object(PhpAmqpLib\Wire\AMQPReader), Object(PhpAmqpLib\Message\AMQPMessage))
+#17 /app/code/yii2/advance/vendor/php-amqplib/php-amqplib/PhpAmqpLib/Channel/AbstractChannel.php(202): call_user_func(Array, Object(PhpAmqpLib\Wire\AMQPReader), Object(PhpAmqpLib\Message\AMQPMessage))
+#18 /app/code/yii2/advance/vendor/php-amqplib/php-amqplib/PhpAmqpLib/Channel/AbstractChannel.php(341): PhpAmqpLib\Channel\AbstractChannel->dispatch('60,60', '\x1Famq.ctag--WMM9...', Object(PhpAmqpLib\Message\AMQPMessage))
+#19 /app/code/yii2/advance/console/controllers/RabbitUserController.php(144): PhpAmqpLib\Channel\AbstractChannel->wait()
+#20 [internal function]: console\controllers\RabbitUserController->actionWorker()
+#21 /app/code/yii2/advance/vendor/yiisoft/yii2/base/InlineAction.php(57): call_user_func_array(Array, Array)
+#22 /app/code/yii2/advance/vendor/yiisoft/yii2/base/Controller.php(157): yii\base\InlineAction->runWithParams(Array)
+#23 /app/code/yii2/advance/vendor/yiisoft/yii2/console/Controller.php(135): yii\base\Controller->runAction('worker', Array)
+#24 /app/code/yii2/advance/vendor/yiisoft/yii2/base/Module.php(528): yii\console\Controller->runAction('worker', Array)
+#25 /app/code/yii2/advance/vendor/yiisoft/yii2/console/Application.php(180): yii\base\Module->runAction('rabbit-user/wor...', Array)
+#26 /app/code/yii2/advance/vendor/yiisoft/yii2/console/Application.php(147): yii\console\Application->runAction('rabbit-user/wor...', Array)
+#27 /app/code/yii2/advance/vendor/yiisoft/yii2/base/Application.php(386): yii\console\Application->handleRequest(Object(yii\console\Request))
+#28 /app/code/yii2/advance/yii(27): yii\base\Application->run()
+#29 {main}