Merge remote-tracking branch 'origin/master'

UPGRADE.md

+# 1.0.28
+- 拼团 消息队列枚举
+# 1.0.27
+- cmq 内外网切换
+# 1.0.26
+- 卖家分销 消息队列枚举
 # 1.0.25
 - 佣金操作增加用于幂等验证的uniqueId
 # 1.0.24

src/Cmq/Account.php

@@ -29,7 +29,9 @@ class Account
 	{
 		$config = include alias('@vendor/hdll/services/src/Common/Config') . '/config.php';
 		$config = $config['cmq'];
-		$this->host = empty($host) ? $config['host'] : $host;
+		if (empty($host)){
+			$this->host = empty(env('ENVIRONMENT','')) ?$config['intranet_host'] : $config['internet_host'];
+		}
 		$this->secretId = empty($secretId) ? $config['secretId'] : $secretId;
 		$this->secretKey = empty($secretKey) ? $config['secretKey'] : $secretKey;
 		$this->cmq_client = new CMQClient($this->host, $this->secretId, $this->secretKey);

src/Common/Config/config.php

@@ -18,8 +18,8 @@ return [
 		'secretKey' => 'IPL5g5PaaSAzd6NSO8gEmLxcN4pTzJSQ',
 	],
 	'cmq' => [
-//		'host' => 'http://cmq-topic-bj.api.tencentyun.com',//内网
-		'host' => 'https://cmq-topic-bj.api.qcloud.com',//外网
+		'intranet_host' => 'http://cmq-topic-bj.api.tencentyun.com',//内网
+		'internet_host' => 'https://cmq-topic-bj.api.qcloud.com',//外网
 		'secretId' => 'AKIDYRW1cG2iVIg8dAoCe86vhNuA7A5oNknk',
 		'secretKey' => 'z0ymS7xfLrP6Sk2EKHWaXN6d0EIxX0IQ',
 	],

src/GroupBooking/Enum/GroupBookingCmqEnum.php

+<?php
+namespace Hdll\Services\GroupBooking\Enum;
+
+class GroupBookingCmqEnum{
+
+	const TOPIC = 'groupBooking';
+
+	const CLOSE_RECORD = 'closeRecord';
+}
\ No newline at end of file

src/SellerDistribution/Enum/SellerDistributionCmqEnum.php

@@ -9,4 +9,5 @@ class SellerDistributionCmqEnum{
 	const REDUCE_BALANCE = 'reduceBalance';
 	const ADD_TOTAL = 'addTotal';
 	const REFUND_ADD_BALANCE = 'refundAddBalance';
+	const UPDATE_BILL = 'updateBill';
 }
\ No newline at end of file