Browse Source

忽略.idea文件夹,service层域名固定下来

Robin 6 years ago
parent
commit
d88aa660fa

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+/.idea/

+ 2 - 1
README.md

@@ -43,7 +43,8 @@ CRM项目多版本并行管理基础版本
 ==
 业务层通用配置:
 
-    在/项目名/common/config/params.php中通过配置Url和ApiSecret来指定service层的请求地址,并通过service层的权限校验
+    在/项目名/common/config/params.php中通过配置Url和ApiSecret来指定service层的请求地址,并通过service层的权限校验。
+    前台指向service层域名www.service.com,后台指向service层域名crm.service.com。线上和本地将service层域名写入host文件即可。
     
 前台业务层配置:
 

+ 2 - 7
normand/frontend/common/config/params.php

@@ -3,14 +3,9 @@ return [
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
-
-    //'xcoqServiceBaseUrl' => 'http://frontend.service.fxm.me',
-//  'xcoqServiceBaseUrl' => 'http://fxm.frontend.service.com',
-    'xcoqServiceBaseUrl' => 'http://front.service.com',
+    'xcoqServiceBaseUrl' => 'http://www.service.com',
     'xcoqServiceApiSecret' => 'app_oauth#^a3dl0psDM50*$%Tua@wtc467^',
-
-    //'xcrmServiceBaseUrl' => 'http://backend.service.fxm.me',
-    'xcrmServiceBaseUrl' => 'http://front.service.com',
+    'xcrmServiceBaseUrl' => 'http://www.service.com',
     'xcrmServiceApiSecret' => 'app_oauth#^a3dl0psDM50*$%Tua@wtc467^',
 
     'xcoqBaseUrl' => 'http://www.hk-dsm.com',

+ 1 - 1
normand/service/common/config/db-crm.php

@@ -3,6 +3,6 @@ return [
     'class' => 'yii\db\Connection',
     'dsn' => 'mysql:host=192.168.1.188;dbname=fxm_crm',
     'username' => 'root',
-    'password' => '123456',
+    'password' => 'Robin1992',
     'charset' => 'utf8',
 ];

+ 1 - 1
normand/service/common/config/db.php

@@ -3,6 +3,6 @@ return [
     'class' => 'yii\db\Connection',
     'dsn' => 'mysql:host=127.0.0.1;dbname=normandmkt_offcial',
     'username' => 'root',
-    'password' => 'taita151',
+    'password' => 'Robin1992',
     'charset' => 'utf8',
 ];

+ 2 - 2
normandcrm/admin/common/config/params-local.php

@@ -1,8 +1,8 @@
 <?php
 return [
-    'xcoqServiceBaseUrl' => 'http://crm-service-frontend.local.xcoq.com',
+    'xcoqServiceBaseUrl' => 'http://crm.service.com',
     'xcoqServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
-    'xcrmServiceBaseUrl' => 'http://service.crm.helongfx.com',    //服务器地址
+    'xcrmServiceBaseUrl' => 'http://crm.service.com',    //服务器地址
     'xcrmServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 ];

+ 2 - 2
normandcrm/admin/common/config/params.php

@@ -4,10 +4,10 @@ return [
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
 
-    'xcoqServiceBaseUrl' => 'http://crm-service-frontend.local.trends-fx.com',
+    'xcoqServiceBaseUrl' => 'http://crm.service.com',
     'xcoqServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
-    'xcrmServiceBaseUrl' => 'http://service.crm.helongfx.com',
+    'xcrmServiceBaseUrl' => 'http://crm.service.com',
     'xcrmServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
     'xcoqBaseUrl' => 'http://www.normandmkt.com/',     //返回官网

+ 3 - 3
normandcrm/crm/common/config/params-local.php

@@ -1,11 +1,11 @@
 <?php
 return [
-    'xcoqServiceBaseUrl' => 'http://service.web.taikong88.com',
+    'xcoqServiceBaseUrl' =>'http://crm.service.com',
     'xcoqServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
-    'xcoqAsiaServiceBaseUrl' => 'http://service.hk.taikong88.com',
+    'xcoqAsiaServiceBaseUrl' => 'http://crm.service.com',
     'xcoqAsiaServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
-    'xcrmServiceBaseUrl' => 'http://service.crm.helongfx.com',
+    'xcrmServiceBaseUrl' => 'http://crm.service.com',
     'xcrmServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 ];

+ 2 - 2
normandcrm/crm/common/config/params.php

@@ -4,10 +4,10 @@ return [
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
 
-    'xcoqServiceBaseUrl' => 'http://crm-service-frontend.local.trends-fx.com',  //暂时没有发现作用
+    'xcoqServiceBaseUrl' => 'http://crm.service.com', //暂时没有发现作用
     'xcoqServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
-    'xcrmServiceBaseUrl' => 'http://service.crm.helongfx.com', //服务器地址,不过local文件会重置
+    'xcrmServiceBaseUrl' => 'http://crm.service.com', //服务器地址,不过local文件会重置
     'xcrmServiceApiSecret' => 'app_oauth#^A3lopM5*$%TUa@wtC467^',
 
 

+ 1 - 1
normandcrm/service/common/config/db.php

@@ -3,6 +3,6 @@ return [
     'class' => 'yii\db\Connection',
     'dsn' => 'mysql:host=localhost;dbname=normandmkt_crm',
     'username' => 'root',
-    'password' => 'taita151',
+    'password' => 'Robin1992',
     'charset' => 'utf8',
 ];