域名管理

app/ghs/controllers/RechargeController.php

@@ -67,7 +67,7 @@ class RechargeController extends BaseController
 		$input->SetTime_start(date("YmdHis", $now));
 		$input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
 		$input->SetTime_expire(date("YmdHis", $expireTime));
-		$input->SetNotify_url(Yii::$app->params['shopHost'] . '/notice/wx-callback/');
+		$input->SetNotify_url(Yii::$app->params['hdHost'] . '/notice/wx-callback/');
 		$input->SetTrade_type("JSAPI");
 		
 		$merchantExtend = WxOpenClass::getGhsWxInfo();

app/hd/controllers/RechargeController.php

@@ -81,7 +81,7 @@ class RechargeController extends BaseController
         $input->SetTime_start(date("YmdHis", $now));
         $input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
         $input->SetTime_expire(date("YmdHis", $expireTime));
-        $input->SetNotify_url(Yii::$app->params['shopHost'] . '/notice/wx-callback/');
+        $input->SetNotify_url(Yii::$app->params['hdHost'] . '/notice/wx-callback/');
         $input->SetTrade_type("JSAPI");
 
         $merchantExtend = WxOpenClass::getWxInfo();
@@ -147,7 +147,7 @@ class RechargeController extends BaseController
         $input->SetTime_start(date("YmdHis", $now));
         $input->SetAttach($attach);//将流水类型、代金劵等传给微信再回传
         $input->SetTime_expire(date("YmdHis", $expireTime));
-        $input->SetNotify_url(Yii::$app->params['shopHost'] . '/notice/wx-callback/');
+        $input->SetNotify_url(Yii::$app->params['hdHost'] . '/notice/wx-callback/');
         $input->SetTrade_type("JSAPI");
 
         $merchantExtend = WxOpenClass::getWxInfo();

app/hd/views/main/index.php

@@ -4,7 +4,7 @@
     var clientId;
     var ws;
     function openMsg() {
-        ws = new WebSocket("ws://<?= Yii::$app->params['host'] ?>:8282");
+        ws = new WebSocket("ws://<?= Yii::$app->params['hdShortHost'] ?>:8282");
         //服务端主动推送消息时会触发这里
         ws.onmessage = function (e) {
             var data = eval("(" + e.data + ")");
@@ -13,7 +13,7 @@
                 case 'init':
                     clientId = data.client_id;
                     //当前发起的会话与平台绑定关系
-                    $.post('<?= Yii::$app->params['shopHost'] ?>/chat/bind-console', {clientId: clientId}, function (data) {
+                    $.post('<?= Yii::$app->params['hdHost'] ?>/chat/bind-console', {clientId: clientId}, function (data) {
                     }, 'json');
                 case 'newMessage':
                     if (data.status == 1) {

app/pt/controllers/WxOpenController.php

@@ -30,15 +30,19 @@ class WxOpenController extends PublicController
     {
         $id = Yii::$app->request->get('id', 'hd');
         $open = [];
+        $prefix = '';
         if ($id == 'hd') {
             $open = \biz\wx\classes\WxOpenClass::getByCondition(['style' => \biz\wx\classes\WxOpenClass::OPEN_STYLE_HD]);
+            $prefix = Yii::$app->params['hdPtHost'];
         }
         if ($id == 'ghs') {
             $open = \biz\wx\classes\WxOpenClass::getByCondition(['style' => \biz\wx\classes\WxOpenClass::OPEN_STYLE_GHS]);
+            $prefix = Yii::$app->params['ghsPtHost'];
         }
         if (empty($open)) {
             util::stop('没有找到平台信息');
         }
+        $url = $prefix . '/wx-open-callback/' . $id;
         //1只显示公众号 2只显示小程序  3显示公众号和小程序
         $authType = Yii::$app->request->get('authType', 3);
         $pre = wxUtil::getPreAuthCode($open);
@@ -47,7 +51,6 @@ class WxOpenController extends PublicController
         $oData['preAuthCodeTime'] = date("Y-m-d H:i:s");
         //设置预授码过期，让下个用户可以获取新的预授码
         xhWxOpenService::updateById(1, $oData);
-        $url = Yii::$app->params['ptHost'] . '/wx-open-callback/' . $id;
         Yii::info('callbackUrl:' . $url);
         echo "<a href='https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid={$appId}&pre_auth_code={$pre}&redirect_uri={$url}&auth_type={$authType}'>授权</a>";
     }

biz-hd/message/classes/InformAdminClass.php

@@ -214,7 +214,7 @@ class InformAdminClass extends BaseClass
                 if (isset($admin['adminBaseInfo']['subscribe']) && $admin['adminBaseInfo']['subscribe'] == 1) {
                     $openId = isset($admin['adminBaseInfo']['openId']) ? $admin['adminBaseInfo']['openId'] : '';
                     $miniOpenId = isset($admin['adminBaseInfo']['miniOpenId']) ? $admin['adminBaseInfo']['miniOpenId'] : '';
-                    $url = Yii::$app->params['shopDomain'] . "/#/admin/order/detail?id=" . $order['id'];
+                    $url = Yii::$app->params['hdDomain'] . "/#/admin/order/detail?id=" . $order['id'];
                     $url = httpUtil::becomeHttps($url);
                     $data = [
                         "touser" => $openId,

common/components/miniUtil.php

@@ -1280,7 +1280,7 @@ class miniUtil
 		$curl = new curl\Curl();
 		$mallHost = Yii::$app->params['mallHost'];
 		if ($isOpen == 1) {
-			$mallHost = Yii::$app->params['shopHost'];
+			$mallHost = Yii::$app->params['hdHost'];
 		}
 		$has = strpos($mallHost, 'https');
 		//如果不是https则换成https
@@ -1308,7 +1308,7 @@ class miniUtil
 		$curl = new curl\Curl();
 		$mallHost = Yii::$app->params['mallHost'];
 		if ($isOpen == 1) {
-			$mallHost = Yii::$app->params['shopHost'];
+			$mallHost = Yii::$app->params['hdHost'];
 		}
 		$has = strpos($mallHost, 'https');
 		//如果不是https则换成https
@@ -1332,7 +1332,7 @@ class miniUtil
 		$curl = new curl\Curl();
 		$apiUrl = Yii::$app->params['mallHost'];
 		if ($isOpen == 1) {
-			$apiUrl = Yii::$app->params['shopHost'];
+			$apiUrl = Yii::$app->params['hdHost'];
 		}
 		$imgUrl = Yii::$app->params['imgHost'];
 		

common/components/wxUtil.php

@@ -1285,7 +1285,7 @@ class wxUtil
 		$currentHost = Yii::$app->params['mallHost'];
 		if ($isOpen == 1) {
 			//零售
-			$currentHost = Yii::$app->params['shopHost'];
+			$currentHost = Yii::$app->params['hdHost'];
 		} elseif ($isOpen == 2) {
 			//供货商
 			$currentHost = Yii::$app->params['ghsHost'];
@@ -1319,7 +1319,7 @@ class wxUtil
 		$currentHost = Yii::$app->params['mallHost'];
 		if ($isOpen == 1) {
 			//零售
-			$currentHost = Yii::$app->params['shopHost'];
+			$currentHost = Yii::$app->params['hdHost'];
 		} elseif ($isOpen == 2) {
 			//供货商
 			$currentHost = Yii::$app->params['ghsHost'];
@@ -1346,7 +1346,7 @@ class wxUtil
 		$curl = new curl\Curl();
 		$apiUrl = Yii::$app->params['mallHost'];
 		if ($isOpen == 1) {
-			$apiUrl = Yii::$app->params['shopHost'];
+			$apiUrl = Yii::$app->params['hdHost'];
 		} elseif ($isOpen == 2) {
 			$apiUrl = Yii::$app->params['ghsHost'];
 		}

common/config/params.php

@@ -12,93 +12,101 @@ $wwwUrl = $http . 'www.' . $suffix;
 $cssUrl = $http . 'css.' . $suffix;
 $jsUrl = $http . 'js.' . $suffix;
 $config = [
-	//全站统一使用的秘钥
-	'secretKey' => 'CzWjvVY5F.dUqT65Knj81qh_eU2wI3SokO',
-	'adminUrl' => $adminUrl,
-	'frontUrl' => $frontUrl,
-	'openUrl' => $openUrl,
-	'picUrl' => $picUrl,
-	'wwwUrl' => $wwwUrl,
-	'mobileUrl' => $mobileUrl,
-	'miniUrl' => $miniUrl,
-	//平台来源
-	'ptSource' => [
-		//商城移动端
-		'mobile' => 1,
-		//商城小程序
-		'mini' => 2,
-		//商家后台PC端
-		'admin' => 3,
-		//商家后台移动端
-		'back' => 4,
-		//总后台
-		'saas' => 5,
-	],
-	//永不过期时间
-	'neverExpireTime' => 4102416000,
-	//永不过期日期
-	'neverExpireDate' => '2100-01-01 00:00:00',
-	'pageSize' => 20,
+    //全站统一使用的秘钥
+    'secretKey' => 'CzWjvVY5F.dUqT65Knj81qh_eU2wI3SokO',
+    'adminUrl' => $adminUrl,
+    'frontUrl' => $frontUrl,
+    'openUrl' => $openUrl,
+    'picUrl' => $picUrl,
+    'wwwUrl' => $wwwUrl,
+    'mobileUrl' => $mobileUrl,
+    'miniUrl' => $miniUrl,
+    //平台来源
+    'ptSource' => [
+        //商城移动端
+        'mobile' => 1,
+        //商城小程序
+        'mini' => 2,
+        //商家后台PC端
+        'admin' => 3,
+        //商家后台移动端
+        'back' => 4,
+        //总后台
+        'pt' => 5,
+    ],
+    //永不过期时间
+    'neverExpireTime' => 4102416000,
+    //永不过期日期
+    'neverExpireDate' => '2100-01-01 00:00:00',
+    'pageSize' => 20,
 ];
 
 $prefixHttp = 'http://';
 $userAgent = isset($_SERVER['HTTP_USER_AGENT']) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '';
 if (strpos($userAgent, 'miniprogram') === true) {
-	$prefixHttp = 'https://';
+    $prefixHttp = 'https://';
 }
 $referrer = isset($_SERVER["HTTP_REFERER"]) ? strtolower($_SERVER["HTTP_REFERER"]) : '';
 if (strpos($referrer, 'servicewechat.com') === true) {
-	$prefixHttp = 'https://';
+    $prefixHttp = 'https://';
 }
 if (strpos($referrer, 'https') === true) {
-	$prefixHttp = 'https://';
+    $prefixHttp = 'https://';
 }
-if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){
-	$prefixHttp = 'https://';
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+    $prefixHttp = 'https://';
 }
 
 if (getenv('YII_ENV') == 'local') {
-	$config['mallHost'] = $prefixHttp . 'api.mall.hhb.com';
-	$config['shopHost'] = $prefixHttp . 'api.shop.hhb.com';
-	$config['ptHost'] = $prefixHttp . 'api.saas.hhb.com';
-    $config['ghsHost'] = $prefixHttp . 'api.ghs.hhb.com';
-	$config['host'] = 'hhb.com';
-	$config['imgHost'] = $prefixHttp . 'img.hhb.com';
-    $config['mallDomain'] = $prefixHttp . 'mall.hhb.com';
-    $config['shopDomain'] = $prefixHttp . 'shop.hhb.com';
-    $config['ghsDomain'] = $prefixHttp . 'ghs.hhb.com';
+    $config['hdHost'] = $prefixHttp . 'api.shop.hhb.com';
+    $config['hdDomain'] = $prefixHttp . 'shop.hhb.com';
+    $config['hdPtHost'] = $prefixHttp . 'api.pt.hhb.com';
+    $config['hdShortHost'] = 'hhb.com';
+    $config['hdImgHost'] = $prefixHttp . 'img.hhb.com';
+
+    $config['ghsHost'] = $prefixHttp . 'api.ghs.xhb.com';
+    $config['ghsDomain'] = $prefixHttp . 'shop.xhb.com';
+    $config['ghsPtHost'] = $prefixHttp . 'api.pt.xhb.com';
+    $config['ghsShortHost'] = 'xhb.com';
+    $config['ghsImgHost'] = $prefixHttp . 'img.xhb.com';
 }
 if (getenv('YII_ENV') == 'test') {
-	$config['mallHost'] = $prefixHttp . 'api.mall.hzghd.com';
-	$config['shopHost'] = $prefixHttp . 'api.shop.hzghd.com';
-	$config['ptHost'] = $prefixHttp . 'api.saas.hzghd.com';
+    $config['hdHost'] = $prefixHttp . 'api.shop.huaml.com';
+    $config['hdDomain'] = $prefixHttp . 'shop.huaml.com';
+    $config['hdPtHost'] = $prefixHttp . 'api.pt.huaml.com';
+    $config['hdShortHost'] = 'huaml.com';
+    $config['hdImgHost'] = $prefixHttp . 'img.huaml.com';
+
     $config['ghsHost'] = $prefixHttp . 'api.ghs.hzghd.com';
-	$config['host'] = 'hzghd.com';
-	$config['imgHost'] = $prefixHttp . 'img.hzghd.com';
-    $config['mallDomain'] = $prefixHttp . 'mall.hzghd.com';
-    $config['shopDomain'] = $prefixHttp . 'shop.hzghd.com';
-    $config['ghsDomain'] = $prefixHttp . 'ghs.hzghd.com';
+    $config['ghsDomain'] = $prefixHttp . 'shop.hzghd.com';
+    $config['ghsPtHost'] = $prefixHttp . 'api.pt.hzghd.com';
+    $config['ghsShortHost'] = 'hzghd.com';
+    $config['ghsImgHost'] = $prefixHttp . 'img.hzghd.com';
 }
 if (getenv('YII_ENV') == 'dev') {
-	$config['mallHost'] = $prefixHttp . 'api.mall.huaml.com';
-	$config['shopHost'] = $prefixHttp . 'api.shop.huaml.com';
-	$config['ptHost'] = $prefixHttp . 'api.saas.huaml.com';
-    $config['ghsHost'] = $prefixHttp . 'api.ghs.huaml.com';
-	$config['host'] = 'huaml.com';
-	$config['imgHost'] = $prefixHttp . 'img.huaml.com';
-    $config['mallDomain'] = $prefixHttp . 'mall.huaml.com';
-    $config['shopDomain'] = $prefixHttp . 'shop.huaml.com';
-    $config['ghsDomain'] = $prefixHttp . 'ghs.huaml.com';
+    $config['hdHost'] = $prefixHttp . 'api.shop.huaml.com';
+    $config['hdDomain'] = $prefixHttp . 'shop.huaml.com';
+    $config['hdPtHost'] = $prefixHttp . 'api.pt.huaml.com';
+    $config['hdShortHost'] = 'huaml.com';
+    $config['hdImgHost'] = $prefixHttp . 'img.huaml.com';
+
+    $config['ghsHost'] = $prefixHttp . 'api.ghs.hzghd.com';
+    $config['ghsDomain'] = $prefixHttp . 'shop.hzghd.com';
+    $config['ghsPtHost'] = $prefixHttp . 'api.pt.hzghd.com';
+    $config['ghsShortHost'] = 'hzghd.com';
+    $config['ghsImgHost'] = $prefixHttp . 'img.hzghd.com';
 }
 if (getenv('YII_ENV') == 'production') {
-	$config['mallHost'] = $prefixHttp . 'api.mall.huahb.com';
-	$config['shopHost'] = $prefixHttp . 'api.shop.huahb.com';
-	$config['ptHost'] = $prefixHttp . 'api.saas.huahb.com';
-    $config['ghsHost'] = $prefixHttp . 'api.ghs.huahb.com';
-	$config['host'] = 'huahb.com';
-	$config['imgHost'] = $prefixHttp . 'img.huahb.com';
-    $config['mallDomain'] = $prefixHttp . 'mall.huahb.com';
-    $config['shopDomain'] = $prefixHttp . 'shop.huahb.com';
-    $config['ghsDomain'] = $prefixHttp . 'ghs.huahb.com';
+    $config['hdHost'] = $prefixHttp . 'api.shop.huahb.com';
+    $config['hdDomain'] = $prefixHttp . 'shop.huahb.com';
+    $config['hdPtHost'] = $prefixHttp . 'api.pt.huahb.com';
+    $config['hdShortHost'] = 'huahb.com';
+    $config['hdImgHost'] = $prefixHttp . 'img.huahb.com';
+
+    $config['ghsHost'] = $prefixHttp . 'api.ghs.wixhb.com';
+    $config['ghsDomain'] = $prefixHttp . 'shop.wixhb.com';
+    $config['ghsPtHost'] = $prefixHttp . 'api.pt.wixhb.com';
+    $config['ghsShortHost'] = 'wixhb.com';
+    $config['ghsImgHost'] = $prefixHttp . 'img.wixhb.com';
 }
 return $config;

common/services/xhWxMenuService.php

@@ -22,11 +22,11 @@ class xhWxMenuService
 		self::delMenuList($merchantId);
 		$menuOption = configDict::getConfig('wxMenuOption');
 		$mallDomain = Yii::$app->params['mallDomain'];
-		$shopDomain = Yii::$app->params['shopDomain'];
+		$hdDomain = Yii::$app->params['hdDomain'];
 		//强制转成https方式
 		if (strpos($mallDomain, 'https') === false) {
 			$mallDomain = str_replace('http', 'https', $mallDomain);
-			$shopDomain = str_replace('http', 'https', $shopDomain);
+			$hdDomain = str_replace('http', 'https', $hdDomain);
 		}
 		if ($isOpen == 0) {
 //		$button = [