Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-mall/controllers/ChatController.php

@@ -3,13 +3,8 @@
 namespace mall\controllers;
 
 use biz\wx\classes\WxMessageClass;
-use bizMall\custom\classes\CustomClass;
-use bizMall\goods\services\GoodsService;
 use bizMall\merchant\classes\ShopClass;
-use bizMall\merchant\services\MerchantService;
 use bizMall\message\services\ChatService;
-use common\components\business;
-use common\components\noticeUtil;
 use common\components\util;
 use Yii;
 use GatewayClient\Gateway;

biz-mall/goods/classes/GoodsClass.php

@@ -2,13 +2,7 @@
 
 namespace bizMall\goods\classes;
 
-use bizMall\goods\services\GoodsCategoryService;
-use bizMall\merchant\services\MerchantService;
-use common\components\business;
-use common\components\imgUtil;
-use common\components\stringUtil;
 use common\components\util;
-use Yii;
 use bizMall\base\classes\BaseClass;
 
 class GoodsClass extends BaseClass

biz-mall/message/services/ChatService.php

@@ -8,6 +8,7 @@ use bizMall\message\classes\ChatClass;
 use bizMall\shop\classes\ShopClass;
 use bizMall\user\services\UserService;
 use common\components\arrayUtil;
+use common\components\imgUtil;
 use Yii;
 use yii\helpers\ArrayHelper;
 
@@ -230,6 +231,8 @@ class ChatService extends BaseService
             $shopList[$shopId]['unReadNum'] = isset($userData[$info['id']]['unReadNum']) ? $userData[$info['id']]['unReadNum'] : 0;
             $shopList[$shopId]['chatTime'] = isset($userData[$info['id']]['time']) ? $userData[$info['id']]['time'] : 0;
 			$shopList[$shopId]['customId'] = isset($hdListByShopId[$info['id']]['customId']) ? $hdListByShopId[$info['id']]['customId'] : 0;
+
+            $shopList[$shopId]['avatar'] = imgUtil::groupImg($info['avatar']) . "?x-oss-process=image/resize,m_fill,h_130,w_130";
         }
         $shopList = arrayUtil::arraySort($shopList, 'chatTime', SORT_DESC);
         return array_values($shopList);

common/components/jwt.php

@@ -79,8 +79,7 @@ class jwt
 	public static function getLoginId()
 	{
 		$header = httpUtil::getHeader();
-		$urlToken = Yii::$app->request->get('token', '');
-		$token = isset($header['token']) && !empty($header['token']) ? $header['token'] : $urlToken;
+		$token = isset($header['token']) && !empty($header['token']) ? $header['token'] : Yii::$app->request->get('token', '');
 		if (empty($token)) {
 			return 0;
 		}