zxiansheng před 4 roky
rodič
revize
660a383ada
4 změnil soubory, kde provedl 21 přidání a 10 odebrání
  1. 18 5
      common/config/main.php
  2. 1 1
      composer.json
  3. 1 2
      composer.lock
  4. 1 2
      vendor/composer/installed.json

+ 18 - 5
common/config/main.php

@@ -1,5 +1,6 @@
 <?php
 $mainConfig = require_once __DIR__ . '/config.php';
+
 return [
     'language' => 'zh-CN',
     'timeZone' => 'PRC',
@@ -20,13 +21,25 @@ return [
         'dbCalc' => array_merge(['class' => 'yii\db\Connection'], $mainConfig['dbCalc']),
 //        'dbShopCalc' => array_merge(['class' => 'yii\db\Connection', 'schemaMap' => ['oci' => 'common\helpers\Schema'],], $mainConfig['dbShopCalc']),
         'dbNetPoint' => array_merge(['class' => 'yii\db\Connection'], $mainConfig['dbNetPoint']),
+        // 'cache' => [
+        //     //'class' => 'yii\caching\FileCache',
+        //     //'class' => 'dcb9\redis\Cache',
+        //     'class' => \yii\redis\Cache::class,
+        //     'redis' => $mainConfig['cacheRedis'],
+        // ],
         'cache' => [
-            //'class' => 'yii\caching\FileCache',
-            'class' => 'dcb9\redis\Cache',
-            'redis' => $mainConfig['cacheRedis'],
+            'class' => 'yii\redis\Cache',
+            //'redis' => $mainConfig['cacheRedis'],
+            'redis' => [
+                'hostname' => '172.18.0.3',
+                'port' => 6379,
+                'database' => 0,
+            ]
         ],
-        'tokenRedis' => array_merge(['class' => 'common\components\Redis'], $mainConfig['tokenRedis']),
-        'redis' => array_merge(['class' => 'common\components\Redis'], $mainConfig['otherRedis']),
+        'tokenRedis' => array_merge(['class' => \yii\redis\Cache::class], $mainConfig['tokenRedis']),
+        'redis' => array_merge(['class' => \yii\redis\Cache::class], $mainConfig['otherRedis']),
+        // 'tokenRedis' => array_merge(['class' => \yii\redis\Cache::class], $mainConfig['tokenRedis']),
+        // 'redis' => array_merge(['class' => \yii\redis\Cache::class], $mainConfig['otherRedis']),
         'mailer' => [
             'class' => 'yii\swiftmailer\Mailer',
             'viewPath' => '@common/mail',

+ 1 - 1
composer.json

@@ -23,7 +23,7 @@
         "anlity/yii2-swoole-async-timer": "^0.9.1",
         "yiisoft/yii2-mongodb": "^2.1",
         "godruoyi/php-snowflake": "^1.0",
-        "yiisoft/yii2-redis": "~2.0.0"
+        "yiisoft/yii2-redis": "^2.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.0.0",

+ 1 - 2
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5cac8a51697564a7d1288e73abefdced",
+    "content-hash": "6d5d83536a6e6b2d6416554a3a4753ba",
     "packages": [
         {
             "name": "anlity/yii2-swoole-async-timer",
@@ -4426,7 +4426,6 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
             "time": "2020-11-30T07:30:19+00:00"
         },
         {

+ 1 - 2
vendor/composer/installed.json

@@ -3411,8 +3411,7 @@
                 "url": "https://github.com/sebastianbergmann",
                 "type": "github"
             }
-        ],
-        "abandoned": true
+        ]
     },
     {
         "name": "sebastian/version",