Browse Source

修改队列模块名称

shish 6 years ago
parent
commit
39a635ffb9

+ 1 - 1
app/business/controllers/ChatController.php

@@ -4,7 +4,7 @@ namespace business\controllers;
 
 use biz\goods\services\GoodsService;
 use biz\merchant\services\MerchantService;
-use biz\MQ\services\ChatService;
+use biz\message\services\ChatService;
 use biz\user\services\UserService;
 use common\components\business;
 use Yii;

+ 1 - 1
app/client/controllers/ChatController.php

@@ -4,7 +4,7 @@ namespace client\controllers;
 
 use biz\goods\services\GoodsService;
 use biz\merchant\services\MerchantService;
-use biz\MQ\services\ChatService;
+use biz\message\services\ChatService;
 use common\components\business;
 use common\components\util;
 use Yii;

+ 1 - 1
app/client/controllers/InformUserController.php

@@ -2,7 +2,7 @@
 
 namespace client\controllers;
 
-use biz\MQ\services\SmsService;
+use biz\message\services\SmsService;
 use biz\user\services\UserAssetService;
 use biz\user\services\UserService;
 use common\components\sms;

+ 1 - 1
app/client/controllers/UserController.php

@@ -3,7 +3,7 @@
 namespace client\controllers;
 
 use biz\merchant\services\MerchantExtendService;
-use biz\MQ\services\SmsService;
+use biz\message\services\SmsService;
 use biz\user\services\UserAssetService;
 use biz\user\services\UserService;
 use common\components\stringUtil;

+ 0 - 11
biz/MQ/classes/InformUserClass.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace biz\MQ\classes;
-
-use Yii;
-use biz\base\classes\BaseClass;
-
-class InformUserClass extends BaseClass
-{
-	public static $baseFile = '\biz\MQ\models\InformUser';
-}

+ 1 - 1
biz/MQ/classes/ChatClass.php → biz/message/classes/ChatClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\MQ\classes;
+namespace biz\message\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;

+ 2 - 2
biz/MQ/classes/InformAdminClass.php → biz/message/classes/InformAdminClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\MQ\classes;
+namespace biz\message\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
@@ -8,6 +8,6 @@ use biz\base\classes\BaseClass;
 class InformAdminClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\MQ\models\InformAdmin';
+	public static $baseFile = '\biz\message\models\InformAdmin';
 
 }

+ 11 - 0
biz/message/classes/InformUserClass.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace biz\message\classes;
+
+use Yii;
+use biz\base\classes\BaseClass;
+
+class InformUserClass extends BaseClass
+{
+	public static $baseFile = '\biz\message\models\InformUser';
+}

+ 2 - 2
biz/MQ/classes/SmsClass.php → biz/message/classes/SmsClass.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace biz\MQ\classes;
+namespace biz\message\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
 
 class SmsClass extends BaseClass
 {
-	public static $baseFile = '\biz\MQ\models\Sms';
+	public static $baseFile = '\biz\message\models\Sms';
 	
 	public static $smsType = [
 		//申请会员

+ 2 - 2
biz/MQ/classes/TMessageClass.php → biz/message/classes/TMessageClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\MQ\classes;
+namespace biz\message\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
@@ -8,7 +8,7 @@ use biz\base\classes\BaseClass;
 class TMessageClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\MQ\models\TMessage';
+	public static $baseFile = '\biz\message\models\TMessage';
 
 	//微信的模板消息
 	public static $tMessage = [

+ 1 - 1
biz/MQ/models/InformAdmin.php → biz/message/models/InformAdmin.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\MQ\models;
+namespace biz\message\models;
 use biz\base\models\Base;
 class InformAdmin extends Base
 {

+ 1 - 1
biz/MQ/models/InformUser.php → biz/message/models/InformUser.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\MQ\models;
+namespace biz\message\models;
 use biz\base\models\Base;
 class InformUser extends Base
 {

+ 1 - 1
biz/MQ/models/Sms.php → biz/message/models/Sms.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\MQ\models;
+namespace biz\message\models;
 use biz\base\models\Base;
 class Sms extends Base
 {

+ 1 - 1
biz/MQ/models/TMessage.php → biz/message/models/TMessage.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\MQ\models;
+namespace biz\message\models;
 use biz\base\models\Base;
 class TMessage extends Base
 {

+ 2 - 2
biz/MQ/services/ChatService.php → biz/message/services/ChatService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace biz\MQ\services;
+namespace biz\message\services;
 
 use biz\base\services\BaseService;
-use biz\MQ\classes\ChatClass;
+use biz\message\classes\ChatClass;
 use biz\user\services\UserService;
 use common\components\arrayUtil;
 use jzweb\open\weixin\lib\user;

+ 2 - 2
biz/MQ/services/InformAdminService.php → biz/message/services/InformAdminService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\MQ\services;
+namespace biz\message\services;
 
 use biz\admin\classes\AdminClass;
 use biz\admin\services\AdminService;
@@ -14,7 +14,7 @@ use linslin\yii2\curl;
 class InformAdminService extends BaseService
 {
 	
-	public static $baseFile = '\biz\MQ\classes\InformAdminClass';
+	public static $baseFile = '\biz\message\classes\InformAdminClass';
 	
 	//门店收入提醒 shish 2019.12.24
 	public static function shopIncomeInformAdmin($data, $merchantId = 0)

+ 2 - 2
biz/MQ/services/InformUserService.php → biz/message/services/InformUserService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\MQ\services;
+namespace biz\message\services;
 
 use biz\base\services\BaseService;
 use biz\user\services\UserService;
@@ -13,7 +13,7 @@ use linslin\yii2\curl;
 class InformUserService extends BaseService
 {
 
-	public static $baseFile = '\biz\MQ\classes\InformUserClass';
+	public static $baseFile = '\biz\message\classes\InformUserClass';
 
 	//送到通知客户
 	public static function reachInformUser($userId)

+ 3 - 3
biz/MQ/services/SmsService.php → biz/message/services/SmsService.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace biz\MQ\services;
+namespace biz\message\services;
 
 use biz\base\services\BaseService;
-use biz\MQ\classes\SmsClass;
+use biz\message\classes\SmsClass;
 use Yii;
 use linslin\yii2\curl;
 
 class SmsService extends BaseService
 {
 	
-	public static $baseFile = '\biz\MQ\classes\SmsClass';
+	public static $baseFile = '\biz\message\classes\SmsClass';
 	
 	//设置申请会员的验证码 shish 2019.12.18
 	public static function setApplyMemberCode($userId, $code)

+ 2 - 2
biz/MQ/services/TMessageService.php → biz/message/services/TMessageService.php

@@ -1,12 +1,12 @@
 <?php
-namespace biz\MQ\services;
+namespace biz\message\services;
 use biz\base\services\BaseService;
 use Yii;
 use linslin\yii2\curl;
 class TMessageService extends BaseService
 {
 
-	public static $baseFile = '\biz\MQ\classes\TMessageClass';
+	public static $baseFile = '\biz\message\classes\TMessageClass';
 
 	//商家宝贝售出提醒 shish 2019.9.11
 	public static function adminGoodsSold($data)

+ 1 - 1
biz/user/classes/UserClass.php

@@ -3,7 +3,7 @@
 namespace biz\user\classes;
 
 use biz\merchant\classes\MerchantAssetClass;
-use biz\MQ\classes\ChatClass;
+use biz\message\classes\ChatClass;
 use biz\user\services\UserIntegralService;
 use common\components\business;
 use common\components\configDict;

+ 2 - 2
common/config/rabbitMQ.php

@@ -20,8 +20,8 @@ $rabbitMQ = [
 	'class' => 'mikemadisonweb\rabbitmq\Configuration',
 	'connections' => [
 		[
-			'host' => '127.0.0.1',
-			'port' => '5672',
+			'host' => getenv('RABBIT_MQ_HOST'),
+			'port' => getenv('RABBIT_MQ_PORT'),
 			'user' => 'guest',
 			'password' => 'guest',
 			'vhost' => '/', //虚拟主机

+ 1 - 1
common/services/xhMerchantAssetService.php

@@ -2,7 +2,7 @@
 
 namespace common\services;
 
-use biz\MQ\services\InformAdminService;
+use biz\message\services\InformAdminService;
 use biz\stat\services\StatIncomeCategoryService;
 use biz\stat\services\StatIncomeSourceService;
 use Yii;