Charlie 9 年 前
コミット
d31fb77d3f
2 ファイル変更50 行追加125 行削除
  1. 49 124
      www/protected/config/console.php
  2. 1 1
      www/protected/config/test.php

+ 49 - 124
www/protected/config/console.php

@@ -1,8 +1,8 @@
 <?php
-include('WoZhua_Const.php');
+include('yiguanjia_const.php');
 $env = @file_get_contents(__DIR__.DIRECTORY_SEPARATOR."env.txt");
 if(trim($env) == 'develop'){// 本地配置
-    define('DB_CONNETC', 'mongodb://192.168.1.192:27017');
+    define('DB_CONNETC', 'mongodb://127.0.0.1:27017');
     define('ENVIRONMENT', 'test');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
@@ -12,25 +12,20 @@ if(trim($env) == 'develop'){// 本地配置
         'language' => 'zh_cn',
         // autoloading model and component classes
         'import'=>array(
-                'application.models.*',
-               'application.models.wozhua.*',
-               'application.models.redis.*',
-               'application.models.wozhua_admin.*',
-               'application.components.*',
-               'ext.YiiMongoDbSuite.*',
-               'ext.redis.*',
-               'ext.solr.*',
-               'application.vendors.*',
-               'application.behaviors.*',
-               'application.services.*',
-               'application.controllers.*',
-               'application.message.*',
-               'application.widget.*',
-               'application.modules.o2o.models.*',
-               'application.modules.dataview.models.*',
-               'application.modules.weixin.models.*',
-               'application.modules.deal.models.*',
-               'application.modules.remind.models.*',
+            'application.models.*',
+            'application.models.data.*',
+            'application.models.redis.*',
+            'application.models.admin.*',
+            'application.components.*',
+            'ext.YiiMongoDbSuite.*',
+            'ext.redis.*',
+            'application.vendors.*',
+            'application.behaviors.*',
+            'application.services.*',
+            'application.controllers.*',
+            'application.message.*',
+            'application.widget.*',
+            'application.modules.o2o.models.*',
         ),
         // application components
         'components'=>array(
@@ -39,39 +34,31 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'redis' => array(
                 'class' => 'ext.redis.ARedisConnection',
-                'hostname' => '192.168.1.192',
+                'hostname' => '127.0.0.1',
                 'port' => 6379,
                 'database' => 0,
                 'prefix' => 'Yii.redis.'
             ),
             'mongodb_data' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://192.168.1.192:27017',
-                'dbName'           => 'wozhua_data',
-                'fsyncFlag'        => true,
-                'safeFlag'         => true,
-                'useCursor'        => true
-            ),
-            'mongodb_app' => array(//相关小应用的数据库
-                'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://192.168.1.192:27017',
-                'dbName'           => 'wozhua_app',
+                'connectionString' => 'mongodb://127.0.0.1:27017',
+                'dbName'           => 'data',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb_o2o' => array(//o2o的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://192.168.1.192:27017',
-                'dbName'           => 'wozhua_o2o',
+                'connectionString' => 'mongodb://127.0.0.1:27017',
+                'dbName'           => 'fuwu',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://192.168.1.192:27017',
-                'dbName'           => 'wozhua',
+                'connectionString' => 'mongodb://127.0.0.1:27017',
+                'dbName'           => 'backend',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
@@ -79,19 +66,12 @@ if(trim($env) == 'develop'){// 本地配置
             'mongodb_analysis' => array(//统计分析的数据库
                 'class'            => 'EMongoDB',
                 'connectionString' => 'mongodb://192.168.1.192:27017',
-                'dbName'           => 'wozhua_analysis',
-                'fsyncFlag'        => true,
-                'safeFlag'         => true,
-                'useCursor'        => true
-            ),
-            'mongodb_deal' => array(//壹管家宠物买卖数据库
-                'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://192.168.1.192:27017',
-                'dbName'           => 'wozhua_deal',
+                'dbName'           => 'analysis',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
+
             'log'=>array(
                 'class'=>'CLogRouter',
                 'routes'=>array(
@@ -115,7 +95,6 @@ if(trim($env) == 'develop'){// 本地配置
             $wz,
             array(
                 'app'=>'console',
-                "all_user_picked_groups"=>array(new MongoId("546811230eb9fb32018b460c")),
                 'qiniuConfig' => array(
                     'ak'=>'JJO5vl65dPW0Jqq2PJCKVq_s1TZToNHbyltRZF5Z',
                     'sk'=>'UWYsMVOlc0yPdbnwvgZJra_Nz7OBjFzs7Cl7NS1c',
@@ -126,16 +105,11 @@ if(trim($env) == 'develop'){// 本地配置
                     'voice'=>'wozhua-test',//音频文件
                     'video'=>'wozhua-test',//视频文件
                 ),
-                'getuiConfig' => array(
-                    'appid'=>'QHraKDbVTlA2cXwoTlLHu7',
-                    'APPKEY'=>'5DoyuRAJUr8zJFATwnFe76',
-                    'MasterSecret'=>'UVK6vIFJG79cVYod9lBvF1'
-                )
             )
         )
     );
 }elseif(trim($env) == 'product'){
-    define('DB_CONNETC', 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred');
+    define('DB_CONNETC', 'mongodb://root:Yiguanjia6101@10.9.156.18:27017');
     define('ENVIRONMENT', 'product');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
@@ -146,9 +120,9 @@ if(trim($env) == 'develop'){// 本地配置
         // autoloading model and component classes
         'import'=>array(
             'application.models.*',
-            'application.models.wozhua.*',
+            'application.models.data.*',
             'application.models.redis.*',
-            'application.models.wozhua_admin.*',
+            'application.models.admin.*',
             'application.components.*',
             'ext.YiiMongoDbSuite.*',
             'ext.redis.*',
@@ -159,9 +133,6 @@ if(trim($env) == 'develop'){// 本地配置
             'application.message.*',
             'application.widget.*',
             'application.modules.o2o.models.*',
-            'application.modules.dataview.models.*',
-            'application.modules.deal.models.*',
-            'application.modules.remind.models.*',
         ),
 
         // application components
@@ -172,55 +143,40 @@ if(trim($env) == 'develop'){// 本地配置
 
             'redis' => array(
                 'class' => 'ext.redis.ARedisConnection',
-                'hostname' => '10.10.130.87',
+                'hostname' => '10.9.150.228',
                 'port' => 6379,
                 'database' => 0,
                 'prefix' => 'Yii.redis.'
             ),
             'mongodb_data' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
-                'dbName'           => 'wozhua_data',
-                'fsyncFlag'        => true,
-                'safeFlag'         => true,
-                'useCursor'        => true
-            ),
-            'mongodb_app' => array(//相关小应用的数据库
-                'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
-                'dbName'           => 'wozhua_app',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.156.18:27017',
+                'dbName'           => 'data',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
+
             'mongodb_o2o' => array(//o2o的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
-                'dbName'           => 'wozhua_o2o',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.156.18:27017',
+                'dbName'           => 'fuwu',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
-                'dbName'           => 'wozhua',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.156.18:27017',
+                'dbName'           => 'backend',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb_analysis' => array(//统计分析的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
-                'dbName'           => 'wozhua_analysis',
-                'fsyncFlag'        => true,
-                'safeFlag'         => true,
-                'useCursor'        => true
-            ),
-            'mongodb_deal' => array(//壹管家宠物买卖数据库
-                'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua-2015@10.10.167.16:27017,10.10.193.100:27017,10.10.239.135:27017/admin?replicaSet=udb-cadhnj&readPreference=secondaryPreferred',
-                'dbName'           => 'wozhua_deal',
+                'connectionString' => 'mongodb://root:Yiguanjia6101@10.9.156.18:27017',
+                'dbName'           => 'analysis',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
@@ -248,7 +204,6 @@ if(trim($env) == 'develop'){// 本地配置
             $wz,
             array(
                 'app'=>'console',
-                "all_user_picked_groups"=>array(new MongoId("54a0fa1f0eb9fb17308b47a6"),new MongoId("547e9cbe0eb9fbf8768b4d19"),new MongoId("547e9f150eb9fb31028b4dff"),new MongoId("546809090eb9fb33018b4620"),new MongoId("54680df70eb9fb32018b460a")),
                 'qiniuConfig' => array(
                     'ak'=>'JJO5vl65dPW0Jqq2PJCKVq_s1TZToNHbyltRZF5Z',
                     'sk'=>'UWYsMVOlc0yPdbnwvgZJra_Nz7OBjFzs7Cl7NS1c',
@@ -258,17 +213,12 @@ if(trim($env) == 'develop'){// 本地配置
                     'others'=>'wozhua-others',//其他类型的图片
                     'voice'=>'wozhua-voice',//音频文件
                     'video'=>'wozhua-video'//音频文件
-                ),
-                'getuiConfig' => array(
-                    'appid'=>'QHraKDbVTlA2cXwoTlLHu7',
-                    'APPKEY'=>'5DoyuRAJUr8zJFATwnFe76',
-                    'MasterSecret'=>'UVK6vIFJG79cVYod9lBvF1'
                 )
             )
         )
     );
 }else{//测试配置
-    define('DB_CONNETC', 'mongodb://root:wozhua=9527@10.10.221.173:27017');
+    define('DB_CONNETC', 'mongodb://root:wozhua=9527@10.9.198.18:27017');
     define('ENVIRONMENT', 'test');
     return array(
         'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
@@ -279,9 +229,9 @@ if(trim($env) == 'develop'){// 本地配置
         // autoloading model and component classes
         'import'=>array(
             'application.models.*',
-            'application.models.wozhua.*',
+            'application.models.data.*',
             'application.models.redis.*',
-            'application.models.wozhua_admin.*',
+            'application.models.admin.*',
             'application.components.*',
             'ext.YiiMongoDbSuite.*',
             'ext.redis.*',
@@ -292,9 +242,6 @@ if(trim($env) == 'develop'){// 本地配置
             'application.message.*',
             'application.widget.*',
             'application.modules.o2o.models.*',
-            'application.modules.dataview.models.*',
-            'application.modules.deal.models.*',
-            'application.modules.remind.models.*',
         ),
         // application components
         'components'=>array(
@@ -310,48 +257,32 @@ if(trim($env) == 'develop'){// 本地配置
             ),
             'mongodb_data' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
-                'dbName'           => 'wozhua_data',
-                'fsyncFlag'        => true,
-                'safeFlag'         => true,
-                'useCursor'        => true
-            ),
-            'mongodb_app' => array(//相关小应用的数据库
-                'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
-                'dbName'           => 'wozhua_app',
+                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'dbName'           => 'data',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb_o2o' => array(//o2o的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
-                'dbName'           => 'wozhua_o2o',
+                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'dbName'           => 'fuwu',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb' => array(//管理后台的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
-                'dbName'           => 'wozhua',
+                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'dbName'           => 'backend',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
             ),
             'mongodb_analysis' => array(//统计分析的数据库
                 'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
-                'dbName'           => 'wozhua_analysis',
-                'fsyncFlag'        => true,
-                'safeFlag'         => true,
-                'useCursor'        => true
-            ),
-            'mongodb_deal' => array(//壹管家̨宠物买卖数据库
-                'class'            => 'EMongoDB',
-                'connectionString' => 'mongodb://root:wozhua=9527@10.10.221.173:27017',
-                'dbName'           => 'wozhua_deal',
+                'connectionString' => 'mongodb://root:wozhua=9527@10.9.198.18:27017',
+                'dbName'           => 'analysis',
                 'fsyncFlag'        => true,
                 'safeFlag'         => true,
                 'useCursor'        => true
@@ -379,7 +310,6 @@ if(trim($env) == 'develop'){// 本地配置
             $wz,
             array(
                 'app'=>'console',
-                "all_user_picked_groups"=>array(new MongoId("546811230eb9fb32018b460c")),
                 'qiniuConfig' => array(
                     'ak'=>'JJO5vl65dPW0Jqq2PJCKVq_s1TZToNHbyltRZF5Z',
                     'sk'=>'UWYsMVOlc0yPdbnwvgZJra_Nz7OBjFzs7Cl7NS1c',
@@ -389,11 +319,6 @@ if(trim($env) == 'develop'){// 本地配置
                     'others'=>'wozhua-test',//其他类型的图片
                     'voice'=>'wozhua-test',//音频文件
                     'video'=>'wozhua-test'//视频文件
-                ),
-                'getuiConfig' => array(
-                    'appid'=>'lLGTQL6IeV8BCX3WDefBn6',
-                    'APPKEY'=>'7ED37vR1lv8ljgnK2wt0j2',
-                    'MasterSecret'=>'B5bOtLfi9a9yE1oH53K853'
                 )
             )
         )

+ 1 - 1
www/protected/config/test.php

@@ -6,7 +6,7 @@ return CMap::mergeArray(
         'components'=>array(
             'redis' => array(
                 'class' => 'ext.redis.ARedisConnection',
-                'hostname'  => '10.9.150.228',
+                'hostname'  => '10.10.129.247',
                 'port'      => 6379,
                 'database'  => 0,
                 'prefix'    => 'Yii.redis.'